Patch "m68k: mm: Move initrd phys_to_virt handling after paging_init()" has been added to the 6.2-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    m68k: mm: Move initrd phys_to_virt handling after paging_init()

to the 6.2-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     m68k-mm-move-initrd-phys_to_virt-handling-after-pagi.patch
and it can be found in the queue-6.2 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit a6550504a892f478ab32d6582e6bc52a802b8922
Author: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Date:   Mon Feb 27 21:14:13 2023 +0100

    m68k: mm: Move initrd phys_to_virt handling after paging_init()
    
    [ Upstream commit d4b97925e87eb133e400fe4a482d750c74ce392f ]
    
    When booting with an initial ramdisk on platforms where physical memory
    does not start at address zero (e.g. on Amiga):
    
        initrd: 0ef0602c - 0f800000
        Zone ranges:
          DMA      [mem 0x0000000008000000-0x000000f7ffffffff]
          Normal   empty
        Movable zone start for each node
        Early memory node ranges
          node   0: [mem 0x0000000008000000-0x000000000f7fffff]
        Initmem setup node 0 [mem 0x0000000008000000-0x000000000f7fffff]
        Unable to handle kernel access at virtual address (ptrval)
        Oops: 00000000
        Modules linked in:
        PC: [<00201d3c>] memcmp+0x28/0x56
    
    As phys_to_virt() relies on m68k_memoffset and module_fixup(), it must
    not be called before paging_init().  Hence postpone the phys_to_virt
    handling for the initial ramdisk until after calling paging_init().
    
    While at it, reduce #ifdef clutter by using IS_ENABLED() instead.
    
    Fixes: 376e3fdecb0dcae2 ("m68k: Enable memtest functionality")
    Reported-by: Stephen Walsh <vk3heg@xxxxxxxxxx>
    Link: https://lists.debian.org/debian-68k/2022/09/msg00007.html
    Reported-by: John Paul Adrian Glaubitz <glaubitz@xxxxxxxxxxxxxxxxxxx>
    Link: https://lore.kernel.org/r/4f45f05f377bf3f5baf88dbd5c3c8aeac59d94f0.camel@xxxxxxxxxxxxxxxxxxx
    Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
    Acked-by: Finn Thain <fthain@xxxxxxxxxxxxxx>
    Link: https://lore.kernel.org/r/dff216da09ab7a60217c3fc2147e671ae07d636f.1677528627.git.geert@xxxxxxxxxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c
index 3a2bb2e8fdad4..fbff1cea62caa 100644
--- a/arch/m68k/kernel/setup_mm.c
+++ b/arch/m68k/kernel/setup_mm.c
@@ -326,16 +326,16 @@ void __init setup_arch(char **cmdline_p)
 		panic("No configuration setup");
 	}
 
-#ifdef CONFIG_BLK_DEV_INITRD
-	if (m68k_ramdisk.size) {
+	if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) && m68k_ramdisk.size)
 		memblock_reserve(m68k_ramdisk.addr, m68k_ramdisk.size);
+
+	paging_init();
+
+	if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) && m68k_ramdisk.size) {
 		initrd_start = (unsigned long)phys_to_virt(m68k_ramdisk.addr);
 		initrd_end = initrd_start + m68k_ramdisk.size;
 		pr_info("initrd: %08lx - %08lx\n", initrd_start, initrd_end);
 	}
-#endif
-
-	paging_init();
 
 #ifdef CONFIG_NATFEAT
 	nf_init();