From: Mike Rapoport <rppt@kernel.org>
To: Finn Thain <fthain@linux-m68k.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>,
Sam Creasey <sammy@sammy.net>, Jonathan Corbet <corbet@lwn.net>,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-m68k@lists.linux-m68k.org
Subject: Re: [PATCH v3] m68k: Enable memtest functionality
Date: Sun, 21 Nov 2021 08:29:12 +0200 [thread overview]
Message-ID: <YZnnOAoEIS1wmOyr@kernel.org> (raw)
In-Reply-To: <8170fe1d1c62426d82275d36ba409ecc18754292.1637274578.git.fthain@linux-m68k.org>
On Fri, Nov 19, 2021 at 09:29:38AM +1100, Finn Thain wrote:
> Enable the memtest functionality and rearrange some code to prevent it
> from clobbering the initrd.
>
> The code to implement CONFIG_BLK_DEV_INITRD 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/sun3/ftp/pub/m68k/sun3/slime/slime-2.0.tar.gz
> indicates that no BI_RAMDISK entry is ever passed to the kernel due
> to #ifdef 0 around the relevant code.
>
> Cc: Mike Rapoport <rppt@kernel.org>
> Cc: Sam Creasey <sammy@sammy.net>
> Cc: Jonathan Corbet <corbet@lwn.net>
> Signed-off-by: Finn Thain <fthain@linux-m68k.org>
Acked-by: Mike Rapoport <rppt@linux.ibm.com>
> ---
> Is SLIME the only Linux bootloader on Sun 3?
> ---
> Changed since v2:
> - Made conditional on MMU_MOTOROLA.
>
> Changed since v1:
> - Updated documentation.
> ---
> Documentation/admin-guide/kernel-parameters.txt | 2 +-
> arch/m68k/Kconfig | 1 +
> arch/m68k/kernel/setup_mm.c | 15 ++++++---------
> arch/m68k/mm/motorola.c | 2 ++
> 4 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
> index 43dc35fe5bc0..ac42b421a95c 100644
> --- a/Documentation/admin-guide/kernel-parameters.txt
> +++ b/Documentation/admin-guide/kernel-parameters.txt
> @@ -2924,7 +2924,7 @@
> both parameters are enabled, hugetlb_free_vmemmap takes
> precedence over memory_hotplug.memmap_on_memory.
>
> - memtest= [KNL,X86,ARM,PPC,RISCV] Enable memtest
> + memtest= [KNL,X86,ARM,M68K,PPC,RISCV] Enable memtest
> Format: <integer>
> default : 0 <disable>
> Specifies the number of memtest passes to be
> diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
> index 0b50da08a9c5..4cae3fbe7f97 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 if MMU_MOTOROLA
> 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
>
--
Sincerely yours,
Mike.
next prev parent reply other threads:[~2021-11-21 6:29 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-18 22:29 [PATCH v3] m68k: Enable memtest functionality Finn Thain
2021-11-21 6:29 ` Mike Rapoport [this message]
2021-11-29 10:07 ` Geert Uytterhoeven
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YZnnOAoEIS1wmOyr@kernel.org \
--to=rppt@kernel.org \
--cc=corbet@lwn.net \
--cc=fthain@linux-m68k.org \
--cc=geert@linux-m68k.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=sammy@sammy.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).