Re: [PATCH 1/6] powerpc/prom: Introduce early_reserve_mem_old()

On 8/19/21 4:42 PM, Christophe Leroy wrote:

Le 19/08/2021 à 14:56, Cédric Le Goater a écrit :

quoted

and condition its call with IS_ENABLED(CONFIG_PPC32). This fixes a
compile error with W=1.

arch/powerpc/kernel/prom.c: In function ‘early_reserve_mem’:
arch/powerpc/kernel/prom.c:625:10: error: variable ‘reserve_map’ set but not used [-Werror=unused-but-set-variable]
   __be64 *reserve_map;
           ^~~~~~~~~~~
cc1: all warnings being treated as errors

Cc: Christophe Leroy <redacted>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---

  Christophe, I think you had comments on this one ? Yes, I am being a bit lazy.

Yeah, my comment was to leave thing almost as is, just drop the #ifdef CONFIG_PPC32 and instead put something like:

    if (!IS_ENABLED(CONFIG_PPC32))
        return;

quoted

  arch/powerpc/kernel/prom.c | 37 ++++++++++++++++++++-----------------
  1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index f620e04dc9bf..52869d12bc1d 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c

@@ -621,27 +621,14 @@ static void __init early_reserve_mem_dt(void)

      }
  }
  -static void __init early_reserve_mem(void)
+static void __init early_reserve_mem_old(void)

Why old ? Because ppc32 ?

No. because there is message a bit below saying :

		DBG("Found old 32-bit reserve map\n");

I think that's more changes than needed.

OK. np. I will use your suggestion.

Thanks,

C. 

 

quoted

  {
      __be64 *reserve_map;
        reserve_map = (__be64 *)(((unsigned long)initial_boot_params) +
              fdt_off_mem_rsvmap(initial_boot_params));
  -    /* Look for the new "reserved-regions" property in the DT */
-    early_reserve_mem_dt();
-
-#ifdef CONFIG_BLK_DEV_INITRD
-    /* Then reserve the initrd, if any */
-    if (initrd_start && (initrd_end > initrd_start)) {
-        memblock_reserve(ALIGN_DOWN(__pa(initrd_start), PAGE_SIZE),
-            ALIGN(initrd_end, PAGE_SIZE) -
-            ALIGN_DOWN(initrd_start, PAGE_SIZE));
-    }
-#endif /* CONFIG_BLK_DEV_INITRD */
-
-#ifdef CONFIG_PPC32
-    /*
+    /*
       * Handle the case where we might be booting from an old kexec
       * image that setup the mem_rsvmap as pairs of 32-bit values
       */

@@ -659,9 +646,25 @@ static void __init early_reserve_mem(void)

              DBG("reserving: %x -> %x\n", base_32, size_32);
              memblock_reserve(base_32, size_32);
          }
-        return;
      }
-#endif
+}
+
+static void __init early_reserve_mem(void)
+{
+    /* Look for the new "reserved-regions" property in the DT */
+    early_reserve_mem_dt();
+
+#ifdef CONFIG_BLK_DEV_INITRD
+    /* Then reserve the initrd, if any */
+    if (initrd_start && (initrd_end > initrd_start)) {
+        memblock_reserve(ALIGN_DOWN(__pa(initrd_start), PAGE_SIZE),
+            ALIGN(initrd_end, PAGE_SIZE) -
+            ALIGN_DOWN(initrd_start, PAGE_SIZE));
+    }
+#endif /* CONFIG_BLK_DEV_INITRD */
+
+    if (IS_ENABLED(CONFIG_PPC32))
+        early_reserve_mem_old();
  }
    #ifdef CONFIG_PPC_TRANSACTIONAL_MEM