2021-11-11 01:12:41

by Finn Thain

Subject: [PATCH] m68k: Enable memtest kernel parameter

Enable the memtest feature and rearrange some code to prevent it from
clobbering the initrd.

The CONFIG_BLK_DEV_INITRD symbol was conditional on !defined(CONFIG_SUN3).
For simplicity, remove that test on the basis that m68k_ramdisk.size == 0
on Sun 3.

The SLIME source code at http://sammy.net/ shows that no BI_RAMDISK entry
is ever passed to the kernel due to #ifdef 0 around the relevant code.

Cc: Mike Rapoport <[email protected]>
Cc: Sam Creasey <[email protected]>
Signed-off-by: Finn Thain <[email protected]>
---
Are there any other Linux bootloaders on Sun 3?
---
arch/m68k/Kconfig | 1 +
arch/m68k/kernel/setup_mm.c | 15 ++++++---------
arch/m68k/mm/motorola.c | 2 ++
3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 0b50da08a9c5..0e96066b3c46 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -9,6 +9,7 @@ config M68K
select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS
select ARCH_MIGHT_HAVE_PC_PARPORT if ISA
select ARCH_NO_PREEMPT if !COLDFIRE
+ select ARCH_USE_MEMTEST
select ARCH_WANT_IPC_PARSE_VERSION
select BINFMT_FLAT_ARGVP_ENVP_ON_STACK
select DMA_DIRECT_REMAP if HAS_DMA && MMU && !COLDFIRE
diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c
index 4b51bfd38e5f..49e573b94326 100644
--- a/arch/m68k/kernel/setup_mm.c
+++ b/arch/m68k/kernel/setup_mm.c
@@ -338,13 +338,6 @@ void __init setup_arch(char **cmdline_p)
panic("No configuration setup");
}

- paging_init();
-
-#ifdef CONFIG_NATFEAT
- nf_init();
-#endif
-
-#ifndef CONFIG_SUN3
#ifdef CONFIG_BLK_DEV_INITRD
if (m68k_ramdisk.size) {
memblock_reserve(m68k_ramdisk.addr, m68k_ramdisk.size);
@@ -354,6 +347,12 @@ void __init setup_arch(char **cmdline_p)
}
#endif

+ paging_init();
+
+#ifdef CONFIG_NATFEAT
+ nf_init();
+#endif
+
#ifdef CONFIG_ATARI
if (MACH_IS_ATARI)
atari_stram_reserve_pages((void *)availmem);
@@ -364,8 +363,6 @@ void __init setup_arch(char **cmdline_p)
}
#endif

-#endif /* !CONFIG_SUN3 */
-
/* set ISA defs early as possible */
#if defined(CONFIG_ISA) && defined(MULTI_ISA)
if (MACH_IS_Q40) {
diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c
index 9f3f77785aa7..5b6575eb6d02 100644
--- a/arch/m68k/mm/motorola.c
+++ b/arch/m68k/mm/motorola.c
@@ -455,6 +455,8 @@ void __init paging_init(void)

flush_tlb_all();

+ early_memtest(min_addr, max_addr);
+
/*
* initialize the bad page table and bad page to point
* to a couple of allocated pages
--
2.26.3

2021-11-11 02:04:53

by Randy Dunlap

Subject: Re: [PATCH] m68k: Enable memtest kernel parameter

On 11/10/21 5:10 PM, Finn Thain wrote:
> Enable the memtest feature and rearrange some code to prevent it from
> clobbering the initrd.
>
> The CONFIG_BLK_DEV_INITRD symbol was conditional on !defined(CONFIG_SUN3).
> For simplicity, remove that test on the basis that m68k_ramdisk.size == 0
> on Sun 3.
>
> The SLIME source code athttp://sammy.net/ shows that no BI_RAMDISK entry
> is ever passed to the kernel due to #ifdef 0 around the relevant code.
>
> Cc: Mike Rapoport<[email protected]>
> Cc: Sam Creasey<[email protected]>
> Signed-off-by: Finn Thain<[email protected]>
> ---
> Are there any other Linux bootloaders on Sun 3?
> ---
> arch/m68k/Kconfig | 1 +
> arch/m68k/kernel/setup_mm.c | 15 ++++++---------
> arch/m68k/mm/motorola.c | 2 ++
> 3 files changed, 9 insertions(+), 9 deletions(-)

Hi Finn,

Please also update Documentation/admin-guide/kernel-parameters.txt:

memtest= [KNL,X86,ARM,PPC,RISCV] Enable memtest

to include "M68K".

thanks.
--
~Randy

2021-11-11 06:21:12

by Finn Thain

Subject: Re: [PATCH] m68k: Enable memtest kernel parameter

On Wed, 10 Nov 2021, Randy Dunlap wrote:

> On 11/10/21 5:10 PM, Finn Thain wrote:
> > Enable the memtest feature and rearrange some code to prevent it from
> > clobbering the initrd.
> >
> > The CONFIG_BLK_DEV_INITRD symbol was conditional on !defined(CONFIG_SUN3).
> > For simplicity, remove that test on the basis that m68k_ramdisk.size == 0
> > on Sun 3.
> >
> > The SLIME source code athttp://sammy.net/ shows that no BI_RAMDISK entry
> > is ever passed to the kernel due to #ifdef 0 around the relevant code.
> >
> > Cc: Mike Rapoport<[email protected]>
> > Cc: Sam Creasey<[email protected]>
> > Signed-off-by: Finn Thain<[email protected]>
> > ---
> > Are there any other Linux bootloaders on Sun 3?
> > ---
> > arch/m68k/Kconfig | 1 +
> > arch/m68k/kernel/setup_mm.c | 15 ++++++---------
> > arch/m68k/mm/motorola.c | 2 ++
> > 3 files changed, 9 insertions(+), 9 deletions(-)
>
> Hi Finn,
>
> Please also update Documentation/admin-guide/kernel-parameters.txt:
>
> memtest= [KNL,X86,ARM,PPC,RISCV] Enable memtest
>
> to include "M68K".
>
> thanks.
>

Will do.

Thanks for your review.