powerpc/64s: xmon do not dump hash fields when using radix mode

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index ad6a549a3080de8b8e7c8c37b535dd4709d8f927..694c1d92e7969b4fc67df0a28623a75381ca2b2b 100644 (file)
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -2378,30 +2378,32 @@ static void dump_one_paca(int cpu)
        DUMP(p, cpu_start, "%#-*x");
        DUMP(p, kexec_state, "%#-*x");
 #ifdef CONFIG_PPC_BOOK3S_64
-       for (i = 0; i < SLB_NUM_BOLTED; i++) {
-               u64 esid, vsid;
+       if (!early_radix_enabled()) {
+               for (i = 0; i < SLB_NUM_BOLTED; i++) {
+                       u64 esid, vsid;
 
-               if (!p->slb_shadow_ptr)
-                       continue;
+                       if (!p->slb_shadow_ptr)
+                               continue;
 
-               esid = be64_to_cpu(p->slb_shadow_ptr->save_area[i].esid);
-               vsid = be64_to_cpu(p->slb_shadow_ptr->save_area[i].vsid);
+                       esid = be64_to_cpu(p->slb_shadow_ptr->save_area[i].esid);
+                       vsid = be64_to_cpu(p->slb_shadow_ptr->save_area[i].vsid);
 
-               if (esid || vsid) {
-                       printf(" %-*s[%d] = 0x%016llx 0x%016llx\n",
-                              22, "slb_shadow", i, esid, vsid);
+                       if (esid || vsid) {
+                               printf(" %-*s[%d] = 0x%016llx 0x%016llx\n",
+                                      22, "slb_shadow", i, esid, vsid);
+                       }
                }
-       }
-       DUMP(p, vmalloc_sllp, "%#-*x");
-       DUMP(p, stab_rr, "%#-*x");
-       DUMP(p, slb_used_bitmap, "%#-*x");
-       DUMP(p, slb_kern_bitmap, "%#-*x");
+               DUMP(p, vmalloc_sllp, "%#-*x");
+               DUMP(p, stab_rr, "%#-*x");
+               DUMP(p, slb_used_bitmap, "%#-*x");
+               DUMP(p, slb_kern_bitmap, "%#-*x");
 
-       if (!early_cpu_has_feature(CPU_FTR_ARCH_300)) {
-               DUMP(p, slb_cache_ptr, "%#-*x");
-               for (i = 0; i < SLB_CACHE_ENTRIES; i++)
-                       printf(" %-*s[%d] = 0x%016x\n",
-                              22, "slb_cache", i, p->slb_cache[i]);
+               if (!early_cpu_has_feature(CPU_FTR_ARCH_300)) {
+                       DUMP(p, slb_cache_ptr, "%#-*x");
+                       for (i = 0; i < SLB_CACHE_ENTRIES; i++)
+                               printf(" %-*s[%d] = 0x%016x\n",
+                                      22, "slb_cache", i, p->slb_cache[i]);
+               }
        }
 
        DUMP(p, rfi_flush_fallback_area, "%-*px");