Re: [PATCH AUTOSEL 5.18 39/41] wireguard: selftests: use virt machine on m68k
On Sun, Jul 17, 2022 at 07:01:21PM -0400, Sasha Levin wrote: On Thu, Jul 14, 2022 at 09:08:49AM +0200, Geert Uytterhoeven wrote: Hi Sasha, On Thu, Jul 14, 2022 at 6:29 AM Sasha Levin wrote: From: "Jason A. Donenfeld" [ Upstream commit 1f2f341a62639c7066ee4c76b7d9ebe867e0a1d5 ] This should be a bit more stable hopefully. Signed-off-by: Jason A. Donenfeld Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin Thanks for your patch! --- a/tools/testing/selftests/wireguard/qemu/arch/m68k.config +++ b/tools/testing/selftests/wireguard/qemu/arch/m68k.config @@ -1,10 +1,7 @@ CONFIG_MMU=y +CONFIG_VIRT=y The m68k virt machine was introduced in v5.19-rc1, so this patch must not be backported to v5.18 and earlier. I'll drop it, thanks! I've clicked the wrong button and still queued it by mistake, now really removed :) -- Thanks, Sasha
Re: [PATCH AUTOSEL 5.18 39/41] wireguard: selftests: use virt machine on m68k
On Thu, Jul 14, 2022 at 09:08:49AM +0200, Geert Uytterhoeven wrote: Hi Sasha, On Thu, Jul 14, 2022 at 6:29 AM Sasha Levin wrote: From: "Jason A. Donenfeld" [ Upstream commit 1f2f341a62639c7066ee4c76b7d9ebe867e0a1d5 ] This should be a bit more stable hopefully. Signed-off-by: Jason A. Donenfeld Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin Thanks for your patch! --- a/tools/testing/selftests/wireguard/qemu/arch/m68k.config +++ b/tools/testing/selftests/wireguard/qemu/arch/m68k.config @@ -1,10 +1,7 @@ CONFIG_MMU=y +CONFIG_VIRT=y The m68k virt machine was introduced in v5.19-rc1, so this patch must not be backported to v5.18 and earlier. I'll drop it, thanks! -- Thanks, Sasha
Re: [PATCH AUTOSEL 5.18 39/41] wireguard: selftests: use virt machine on m68k
Hi Sasha,
On Thu, Jul 14, 2022 at 6:29 AM Sasha Levin wrote:
> From: "Jason A. Donenfeld"
>
> [ Upstream commit 1f2f341a62639c7066ee4c76b7d9ebe867e0a1d5 ]
>
> This should be a bit more stable hopefully.
>
> Signed-off-by: Jason A. Donenfeld
> Signed-off-by: Jakub Kicinski
> Signed-off-by: Sasha Levin
Thanks for your patch!
> --- a/tools/testing/selftests/wireguard/qemu/arch/m68k.config
> +++ b/tools/testing/selftests/wireguard/qemu/arch/m68k.config
> @@ -1,10 +1,7 @@
> CONFIG_MMU=y
> +CONFIG_VIRT=y
The m68k virt machine was introduced in v5.19-rc1, so this patch
must not be backported to v5.18 and earlier.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@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
[PATCH AUTOSEL 5.18 39/41] wireguard: selftests: use virt machine on m68k
From: "Jason A. Donenfeld" [ Upstream commit 1f2f341a62639c7066ee4c76b7d9ebe867e0a1d5 ] This should be a bit more stable hopefully. Signed-off-by: Jason A. Donenfeld Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- tools/testing/selftests/wireguard/qemu/Makefile | 5 +++-- tools/testing/selftests/wireguard/qemu/arch/m68k.config | 9 +++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/wireguard/qemu/Makefile b/tools/testing/selftests/wireguard/qemu/Makefile index bca07b93eeb0..e8a82e495d2e 100644 --- a/tools/testing/selftests/wireguard/qemu/Makefile +++ b/tools/testing/selftests/wireguard/qemu/Makefile @@ -210,10 +210,11 @@ QEMU_ARCH := m68k KERNEL_ARCH := m68k KERNEL_BZIMAGE := $(KERNEL_BUILD_PATH)/vmlinux KERNEL_CMDLINE := $(shell sed -n 's/CONFIG_CMDLINE=\(.*\)/\1/p' arch/m68k.config) +QEMU_VPORT_RESULT := virtio-serial-device ifeq ($(HOST_ARCH),$(ARCH)) -QEMU_MACHINE := -cpu host,accel=kvm -machine q800 -append $(KERNEL_CMDLINE) +QEMU_MACHINE := -cpu host,accel=kvm -machine virt -append $(KERNEL_CMDLINE) else -QEMU_MACHINE := -machine q800 -smp 1 -append $(KERNEL_CMDLINE) +QEMU_MACHINE := -machine virt -smp 1 -append $(KERNEL_CMDLINE) endif else ifeq ($(ARCH),riscv64) CHOST := riscv64-linux-musl diff --git a/tools/testing/selftests/wireguard/qemu/arch/m68k.config b/tools/testing/selftests/wireguard/qemu/arch/m68k.config index 9639bfe06074..39c48cba56b7 100644 --- a/tools/testing/selftests/wireguard/qemu/arch/m68k.config +++ b/tools/testing/selftests/wireguard/qemu/arch/m68k.config @@ -1,10 +1,7 @@ CONFIG_MMU=y +CONFIG_VIRT=y CONFIG_M68KCLASSIC=y -CONFIG_M68040=y -CONFIG_MAC=y -CONFIG_SERIAL_PMACZILOG=y -CONFIG_SERIAL_PMACZILOG_TTYS=y -CONFIG_SERIAL_PMACZILOG_CONSOLE=y +CONFIG_VIRTIO_CONSOLE=y CONFIG_COMPAT_32BIT_TIME=y -CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1 panic_on_warn=1" +CONFIG_CMDLINE="console=ttyGF0 wg.success=vport0p1 panic_on_warn=1" CONFIG_FRAME_WARN=1024 -- 2.35.1
