m68k: virt: Kconfig minor fixes

[PATCH] m68k: virt: Kconfig minor fixes

Posted by Laurent Vivier 3 years, 11 months ago

Select VIRTIO_MENU as it is needed by VIRTIO_MMIO.

Add an ending period at the end the virt machine help message.

Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 arch/m68k/Kconfig.machine | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/m68k/Kconfig.machine b/arch/m68k/Kconfig.machine
index a1042568b9ad..4fbe57de1851 100644
--- a/arch/m68k/Kconfig.machine
+++ b/arch/m68k/Kconfig.machine
@@ -161,10 +161,11 @@ config VIRT
 	select RTC_CLASS
 	select RTC_DRV_GOLDFISH
 	select TTY
+	select VIRTIO_MENU
 	select VIRTIO_MMIO
 	help
 	  This options enable a pure virtual machine based on m68k,
-	  VIRTIO MMIO devices and GOLDFISH interfaces (TTY, RTC, PIC)
+	  VIRTIO MMIO devices and GOLDFISH interfaces (TTY, RTC, PIC).
 
 config PILOT
 	bool
-- 
2.36.1

Re: [PATCH] m68k: virt: Kconfig minor fixes

Posted by Geert Uytterhoeven 3 years, 11 months ago

On Tue, May 31, 2022 at 7:45 PM Laurent Vivier <laurent@vivier.eu> wrote:
> Select VIRTIO_MENU as it is needed by VIRTIO_MMIO.
>
> Add an ending period at the end the virt machine help message.
>
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>

Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
i.e. will queue in the m68k for-v5.20 branch.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH] m68k: virt: Kconfig minor fixes

Posted by Jason A. Donenfeld 3 years, 9 months ago

Hi Geert,

On Thu, Jun 02, 2022 at 09:13:14AM +0200, Geert Uytterhoeven wrote:
> On Tue, May 31, 2022 at 7:45 PM Laurent Vivier <laurent@vivier.eu> wrote:
> > Select VIRTIO_MENU as it is needed by VIRTIO_MMIO.
> >
> > Add an ending period at the end the virt machine help message.
> >
> > Reported-by: Randy Dunlap <rdunlap@infradead.org>
> > Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> 
> Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
> i.e. will queue in the m68k for-v5.20 branch.

Shouldn't this fix make it for 5.19? It causes Kconfig warnings during
builds. So this seems like a ordinary mid-cycle bug that can be fixed.

For example, if you ctrl+f for "unmet direct" in this log, you'll see
this splat in the wireguard CI:
https://build.wireguard.com/random/108f4fea7b6053dfd09039af74c0ac0c32c956be/m68k.log

Jason

Re: [PATCH] m68k: virt: Kconfig minor fixes

Posted by Geert Uytterhoeven 3 years, 9 months ago

Hi Jason,

On Fri, Jul 8, 2022 at 3:25 AM Jason A. Donenfeld <Jason@zx2c4.com> wrote:
> On Thu, Jun 02, 2022 at 09:13:14AM +0200, Geert Uytterhoeven wrote:
> > On Tue, May 31, 2022 at 7:45 PM Laurent Vivier <laurent@vivier.eu> wrote:
> > > Select VIRTIO_MENU as it is needed by VIRTIO_MMIO.
> > >
> > > Add an ending period at the end the virt machine help message.
> > >
> > > Reported-by: Randy Dunlap <rdunlap@infradead.org>
> > > Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> >
> > Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
> > i.e. will queue in the m68k for-v5.20 branch.
>
> Shouldn't this fix make it for 5.19? It causes Kconfig warnings during
> builds. So this seems like a ordinary mid-cycle bug that can be fixed.
>
> For example, if you ctrl+f for "unmet direct" in this log, you'll see
> this splat in the wireguard CI:
> https://build.wireguard.com/random/108f4fea7b6053dfd09039af74c0ac0c32c956be/m68k.log

These are merely configuration warnings, there is no build or runtime
failure.
I reverted this patch, disabled CONFIG_VIRTIO_MENU (which BTW defaults
to y), built and booted a kernel fine, and could login on the console.

So IMHO it can wait.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH] m68k: virt: Kconfig minor fixes

Posted by Jason A. Donenfeld 3 years, 9 months ago

Hi Geert,

On Fri, Jul 08, 2022 at 09:24:59AM +0200, Geert Uytterhoeven wrote:
> Hi Jason,
> 
> On Fri, Jul 8, 2022 at 3:25 AM Jason A. Donenfeld <Jason@zx2c4.com> wrote:
> > On Thu, Jun 02, 2022 at 09:13:14AM +0200, Geert Uytterhoeven wrote:
> > > On Tue, May 31, 2022 at 7:45 PM Laurent Vivier <laurent@vivier.eu> wrote:
> > > > Select VIRTIO_MENU as it is needed by VIRTIO_MMIO.
> > > >
> > > > Add an ending period at the end the virt machine help message.
> > > >
> > > > Reported-by: Randy Dunlap <rdunlap@infradead.org>
> > > > Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> > >
> > > Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
> > > i.e. will queue in the m68k for-v5.20 branch.
> >
> > Shouldn't this fix make it for 5.19? It causes Kconfig warnings during
> > builds. So this seems like a ordinary mid-cycle bug that can be fixed.
> >
> > For example, if you ctrl+f for "unmet direct" in this log, you'll see
> > this splat in the wireguard CI:
> > https://build.wireguard.com/random/108f4fea7b6053dfd09039af74c0ac0c32c956be/m68k.log
> 
> These are merely configuration warnings, there is no build or runtime
> failure.
> I reverted this patch, disabled CONFIG_VIRTIO_MENU (which BTW defaults
> to y), built and booted a kernel fine, and could login on the console.
> 
> So IMHO it can wait.

Okay, no problem. I suppose 5.19 isn't likely to be an LTS anyway.

Jason

Re: [PATCH] m68k: virt: Kconfig minor fixes

Posted by Geert Uytterhoeven 3 years, 9 months ago

Hi Jason,

On Sat, Jul 9, 2022 at 2:11 AM Jason A. Donenfeld <Jason@zx2c4.com> wrote:
> On Fri, Jul 08, 2022 at 09:24:59AM +0200, Geert Uytterhoeven wrote:
> > On Fri, Jul 8, 2022 at 3:25 AM Jason A. Donenfeld <Jason@zx2c4.com> wrote:
> > > On Thu, Jun 02, 2022 at 09:13:14AM +0200, Geert Uytterhoeven wrote:
> > > > On Tue, May 31, 2022 at 7:45 PM Laurent Vivier <laurent@vivier.eu> wrote:
> > > > > Select VIRTIO_MENU as it is needed by VIRTIO_MMIO.
> > > > >
> > > > > Add an ending period at the end the virt machine help message.
> > > > >
> > > > > Reported-by: Randy Dunlap <rdunlap@infradead.org>
> > > > > Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> > > >
> > > > Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
> > > > i.e. will queue in the m68k for-v5.20 branch.
> > >
> > > Shouldn't this fix make it for 5.19? It causes Kconfig warnings during
> > > builds. So this seems like a ordinary mid-cycle bug that can be fixed.
> > >
> > > For example, if you ctrl+f for "unmet direct" in this log, you'll see
> > > this splat in the wireguard CI:
> > > https://build.wireguard.com/random/108f4fea7b6053dfd09039af74c0ac0c32c956be/m68k.log
> >
> > These are merely configuration warnings, there is no build or runtime
> > failure.
> > I reverted this patch, disabled CONFIG_VIRTIO_MENU (which BTW defaults
> > to y), built and booted a kernel fine, and could login on the console.
> >
> > So IMHO it can wait.
>
> Okay, no problem. I suppose 5.19 isn't likely to be an LTS anyway.

I expect this to be auto-backported to stable 5.18.x and 5.19.x anyway.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH] m68k: virt: Kconfig minor fixes

Posted by Randy Dunlap 3 years, 11 months ago


On 5/31/22 10:45, Laurent Vivier wrote:
> Select VIRTIO_MENU as it is needed by VIRTIO_MMIO.
> 
> Add an ending period at the end the virt machine help message.
> 
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>

Tested-by: Randy Dunlap <rdunlap@infradead.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>

Thanks.

> ---
>  arch/m68k/Kconfig.machine | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/m68k/Kconfig.machine b/arch/m68k/Kconfig.machine
> index a1042568b9ad..4fbe57de1851 100644
> --- a/arch/m68k/Kconfig.machine
> +++ b/arch/m68k/Kconfig.machine
> @@ -161,10 +161,11 @@ config VIRT
>  	select RTC_CLASS
>  	select RTC_DRV_GOLDFISH
>  	select TTY
> +	select VIRTIO_MENU
>  	select VIRTIO_MMIO
>  	help
>  	  This options enable a pure virtual machine based on m68k,
> -	  VIRTIO MMIO devices and GOLDFISH interfaces (TTY, RTC, PIC)
> +	  VIRTIO MMIO devices and GOLDFISH interfaces (TTY, RTC, PIC).
>  
>  config PILOT
>  	bool

-- 
~Randy