ACK: [PATCH][linux-riscv][Hirsute] UBUNTU: [Config] disable deprecated SBI v0.1 support

[Tim Gardner]

Acked-by: Tim Gardner <tim.gardner at canonical.com>

Seems reasonable.

On 4/9/21 6:44 AM, Dimitri John Ledkov wrote:
> This fixes duplicate getty serial & hvc0 consoles on the physical
> console.
> 
> BugLink: https://bugs.launchpad.net/bugs/1923084
> 
> Signed-off-by: Dimitri John Ledkov <xnox at ubuntu.com>
> ---
> 
>   Currently consoles are detected from the device tree and are wired up
>   as the kernel console. Also kernel uses SBIv0.1 exported serial
>   console as hvc0. Which on all current devices is the very same
>   console. This results in two getty running on the same physical
>   console and is not nice at all.
> 
>   This is targetting hirsute linux-riscv v5.11 for the GA.
>   lp:~canonical-kernel/ubuntu/+source/linux-riscv/+git/hirsute -b master
> 
>   debian.riscv/config/annotations          | 6 +++---
>   debian.riscv/config/config.common.ubuntu | 4 +---
>   2 files changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/debian.riscv/config/annotations b/debian.riscv/config/annotations
> index bb738431afc35..09c787e73253d 100644
> --- a/debian.riscv/config/annotations
> +++ b/debian.riscv/config/annotations
> @@ -315,7 +315,7 @@ CONFIG_NOZOMI                                   policy<{'riscv64': 'm'}>
>   CONFIG_NULL_TTY                                 policy<{'riscv64': 'm'}>
>   CONFIG_TRACE_ROUTER                             policy<{'riscv64': 'm'}>
>   CONFIG_TRACE_SINK                               policy<{'riscv64': 'm'}>
> -CONFIG_HVC_RISCV_SBI                            policy<{'riscv64': 'y'}>
> +CONFIG_HVC_RISCV_SBI                            policy<{'riscv64': '-'}>
>   #
>   CONFIG_N_GSM                                    note<LP#1404670>
>   
> @@ -331,7 +331,7 @@ CONFIG_ISI                                      policy<{'riscv64': 'm'}>
>   CONFIG_N_HDLC                                   policy<{'riscv64': 'm'}>
>   
>   # Menu: Device Drivers >> Character devices >> Enable TTY >> Serial drivers
> -CONFIG_SERIAL_EARLYCON_RISCV_SBI                policy<{'riscv64': 'y'}>
> +CONFIG_SERIAL_EARLYCON_RISCV_SBI                policy<{'riscv64': '-'}>
>   CONFIG_SERIAL_KGDB_NMI                          policy<{'riscv64': 'y'}>
>   CONFIG_SERIAL_MAX3100                           policy<{'riscv64': 'm'}>
>   CONFIG_SERIAL_MAX310X                           policy<{'riscv64': 'y'}>
> @@ -7595,7 +7595,7 @@ CONFIG_NO_HZ_IDLE                               note<LP:1413968>
>   
>   # Menu: Kernel features >> Architecture: riscv
>   CONFIG_SECCOMP                                  policy<{'riscv64': 'y'}>
> -CONFIG_RISCV_SBI_V01                            policy<{'riscv64': 'y'}>
> +CONFIG_RISCV_SBI_V01                            policy<{'riscv64': 'n'}>
>   #
>   CONFIG_SECCOMP                                  mark<ENFORCED>
>   
> diff --git a/debian.riscv/config/config.common.ubuntu b/debian.riscv/config/config.common.ubuntu
> index f9f58add52ff0..7064e1444236b 100644
> --- a/debian.riscv/config/config.common.ubuntu
> +++ b/debian.riscv/config/config.common.ubuntu
> @@ -2612,7 +2612,6 @@ CONFIG_HTU21=m
>   CONFIG_HUGETLBFS=y
>   CONFIG_HUGETLB_PAGE=y
>   CONFIG_HVC_DRIVER=y
> -CONFIG_HVC_RISCV_SBI=y
>   CONFIG_HWLAT_TRACER=y
>   CONFIG_HWMON=y
>   # CONFIG_HWMON_DEBUG_CHIP is not set
> @@ -5492,7 +5491,7 @@ CONFIG_RISCV_ERRATA_ALTERNATIVE=y
>   CONFIG_RISCV_INTC=y
>   CONFIG_RISCV_ISA_C=y
>   CONFIG_RISCV_SBI=y
> -CONFIG_RISCV_SBI_V01=y
> +# CONFIG_RISCV_SBI_V01 is not set
>   CONFIG_RISCV_TIMER=y
>   CONFIG_RMI4_2D_SENSOR=y
>   CONFIG_RMI4_CORE=m
> @@ -6165,7 +6164,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
>   CONFIG_SERIAL_DEV_BUS=y
>   CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
>   CONFIG_SERIAL_EARLYCON=y
> -CONFIG_SERIAL_EARLYCON_RISCV_SBI=y
>   # CONFIG_SERIAL_FSL_LINFLEXUART is not set
>   CONFIG_SERIAL_FSL_LPUART=m
>   # CONFIG_SERIAL_IFX6X60 is not set
> 

-- 
-----------
Tim Gardner
Canonical, Inc