powerpc: Remove MMU_FTR_SLB

[karo-tx-linux.git] / arch / powerpc / xmon / xmon.c

diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 08504e75b2c731acd259ec5b317d97c1cdac8e12..8d198b5e9e0a72813cc2beb702826e1a52072a4f 100644 (file)
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -419,7 +419,7 @@ static int xmon_core(struct pt_regs *regs, int fromipi)
                get_output_lock();
                excprint(regs);
                if (bp) {
-                       printf("cpu 0x%x stopped at breakpoint 0x%x (",
+                       printf("cpu 0x%x stopped at breakpoint 0x%lx (",
                               cpu, BP_NUM(bp));
                        xmon_print_symbol(regs->nip, " ", ")\n");
                }
@@ -513,7 +513,7 @@ static int xmon_core(struct pt_regs *regs, int fromipi)
                excprint(regs);
                bp = at_breakpoint(regs->nip);
                if (bp) {
-                       printf("Stopped at breakpoint %x (", BP_NUM(bp));
+                       printf("Stopped at breakpoint %lx (", BP_NUM(bp));
                        xmon_print_symbol(regs->nip, " ", ")\n");
                }
                if (unrecoverable_excp(regs))
@@ -759,7 +759,7 @@ static void insert_cpu_bpts(void)
                brk.address = dabr.address;
                brk.type = (dabr.enabled & HW_BRK_TYPE_DABR) | HW_BRK_TYPE_PRIV_ALL;
                brk.len = 8;
-               set_breakpoint(&brk);
+               __set_breakpoint(&brk);
        }
        if (iabr && cpu_has_feature(CPU_FTR_IABR))
                mtspr(SPRN_IABR, iabr->address
@@ -997,14 +997,14 @@ static int cpu_cmd(void)
                                        last_cpu = cpu;
                                } else {
                                        if (last_cpu != first_cpu)
-                                               printf("-%lx", last_cpu);
+                                               printf("-0x%lx", last_cpu);
                                        last_cpu = first_cpu = cpu;
-                                       printf(" %lx", cpu);
+                                       printf(" 0x%lx", cpu);
                                }
                        }
                }
                if (last_cpu != first_cpu)
-                       printf("-%lx", last_cpu);
+                       printf("-0x%lx", last_cpu);
                printf("\n");
                return 0;
        }
@@ -1024,7 +1024,7 @@ static int cpu_cmd(void)
                        /* take control back */
                        mb();
                        xmon_owner = smp_processor_id();
-                       printf("cpu %u didn't take control\n", cpu);
+                       printf("cpu 0x%x didn't take control\n", cpu);
                        return 0;
                }
                barrier();
@@ -1086,7 +1086,7 @@ csum(void)
        fcs = 0xffff;
        for (i = 0; i < ncsum; ++i) {
                if (mread(adrs+i, &v, 1) == 0) {
-                       printf("csum stopped at %x\n", adrs+i);
+                       printf("csum stopped at "REG"\n", adrs+i);
                        break;
                }
                fcs = FCS(fcs, v);
@@ -1202,12 +1202,12 @@ bpt_cmds(void)
                        /* assume a breakpoint address */
                        bp = at_breakpoint(a);
                        if (bp == NULL) {
-                               printf("No breakpoint at %x\n", a);
+                               printf("No breakpoint at %lx\n", a);
                                break;
                        }
                }
 
-               printf("Cleared breakpoint %x (", BP_NUM(bp));
+               printf("Cleared breakpoint %lx (", BP_NUM(bp));
                xmon_print_symbol(bp->address, " ", ")\n");
                bp->enabled = 0;
                break;
@@ -1746,7 +1746,7 @@ mwrite(unsigned long adrs, void *buf, int size)
                __delay(200);
                n = size;
        } else {
-               printf("*** Error writing address %x\n", adrs + n);
+               printf("*** Error writing address "REG"\n", adrs + n);
        }
        catch_memory_errors = 0;
        return n;
@@ -2058,10 +2058,6 @@ static void dump_one_paca(int cpu)
        DUMP(p, kernel_toc, "lx");
        DUMP(p, kernelbase, "lx");
        DUMP(p, kernel_msr, "lx");
-#ifdef CONFIG_PPC_STD_MMU_64
-       DUMP(p, stab_real, "lx");
-       DUMP(p, stab_addr, "lx");
-#endif
        DUMP(p, emergency_sp, "p");
 #ifdef CONFIG_PPC_BOOK3S_64
        DUMP(p, mc_emergency_sp, "p");
@@ -2435,7 +2431,7 @@ static void proccall(void)
                ret = func(args[0], args[1], args[2], args[3],
                           args[4], args[5], args[6], args[7]);
                sync();
-               printf("return value is %x\n", ret);
+               printf("return value is 0x%lx\n", ret);
        } else {
                printf("*** %x exception occurred\n", fault_except);
        }
@@ -2694,13 +2690,13 @@ static void xmon_print_symbol(unsigned long address, const char *mid,
 }
 
 #ifdef CONFIG_PPC_BOOK3S_64
-static void dump_slb(void)
+void dump_segments(void)
 {
        int i;
        unsigned long esid,vsid,valid;
        unsigned long llp;
 
-       printf("SLB contents of cpu %x\n", smp_processor_id());
+       printf("SLB contents of cpu 0x%x\n", smp_processor_id());
 
        for (i = 0; i < mmu_slb_size; i++) {
                asm volatile("slbmfee  %0,%1" : "=r" (esid) : "r" (i));
@@ -2726,34 +2722,6 @@ static void dump_slb(void)
                }
        }
 }
-
-static void dump_stab(void)
-{
-       int i;
-       unsigned long *tmp = (unsigned long *)local_paca->stab_addr;
-
-       printf("Segment table contents of cpu %x\n", smp_processor_id());
-
-       for (i = 0; i < PAGE_SIZE/16; i++) {
-               unsigned long a, b;
-
-               a = *tmp++;
-               b = *tmp++;
-
-               if (a || b) {
-                       printf("%03d %016lx ", i, a);
-                       printf("%016lx\n", b);
-               }
-       }
-}
-
-void dump_segments(void)
-{
-       if (mmu_has_feature(MMU_FTR_SLB))
-               dump_slb();
-       else
-               dump_stab();
-}
 #endif
 
 #ifdef CONFIG_PPC_STD_MMU_32