Commit d2f755e0 authored by Ralf Baechle's avatar Ralf Baechle

Reindent dump_tlb.c.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 3fd5646c
...@@ -20,16 +20,25 @@ ...@@ -20,16 +20,25 @@
static inline const char *msk2str(unsigned int mask) static inline const char *msk2str(unsigned int mask)
{ {
switch (mask) { switch (mask) {
case PM_4K: return "4kb"; case PM_4K:
case PM_16K: return "16kb"; return "4kb";
case PM_64K: return "64kb"; case PM_16K:
case PM_256K: return "256kb"; return "16kb";
case PM_64K:
return "64kb";
case PM_256K:
return "256kb";
#ifndef CONFIG_CPU_VR41XX #ifndef CONFIG_CPU_VR41XX
case PM_1M: return "1Mb"; case PM_1M:
case PM_4M: return "4Mb"; return "1Mb";
case PM_16M: return "16Mb"; case PM_4M:
case PM_64M: return "64Mb"; return "4Mb";
case PM_256M: return "256Mb"; case PM_16M:
return "16Mb";
case PM_64M:
return "64Mb";
case PM_256M:
return "256Mb";
#endif #endif
} }
...@@ -47,7 +56,7 @@ void dump_tlb(int first, int last) ...@@ -47,7 +56,7 @@ void dump_tlb(int first, int last)
unsigned int pagemask, c0, c1, asid; unsigned int pagemask, c0, c1, asid;
unsigned long long entrylo0, entrylo1; unsigned long long entrylo0, entrylo1;
unsigned long entryhi; unsigned long entryhi;
int i; int i;
asid = read_c0_entryhi() & 0xff; asid = read_c0_entryhi() & 0xff;
...@@ -58,7 +67,7 @@ void dump_tlb(int first, int last) ...@@ -58,7 +67,7 @@ void dump_tlb(int first, int last)
tlb_read(); tlb_read();
BARRIER(); BARRIER();
pagemask = read_c0_pagemask(); pagemask = read_c0_pagemask();
entryhi = read_c0_entryhi(); entryhi = read_c0_entryhi();
entrylo0 = read_c0_entrylo0(); entrylo0 = read_c0_entrylo0();
entrylo1 = read_c0_entrylo1(); entrylo1 = read_c0_entrylo1();
...@@ -78,13 +87,11 @@ void dump_tlb(int first, int last) ...@@ -78,13 +87,11 @@ void dump_tlb(int first, int last)
printk("\t\t\t[pa=%08Lx c=%d d=%d v=%d g=%Ld]\n", printk("\t\t\t[pa=%08Lx c=%d d=%d v=%d g=%Ld]\n",
(entrylo0 << 6) & PAGE_MASK, c0, (entrylo0 << 6) & PAGE_MASK, c0,
(entrylo0 & 4) ? 1 : 0, (entrylo0 & 4) ? 1 : 0,
(entrylo0 & 2) ? 1 : 0, (entrylo0 & 2) ? 1 : 0, (entrylo0 & 1));
(entrylo0 & 1));
printk("\t\t\t[pa=%08Lx c=%d d=%d v=%d g=%Ld]\n", printk("\t\t\t[pa=%08Lx c=%d d=%d v=%d g=%Ld]\n",
(entrylo1 << 6) & PAGE_MASK, c1, (entrylo1 << 6) & PAGE_MASK, c1,
(entrylo1 & 4) ? 1 : 0, (entrylo1 & 4) ? 1 : 0,
(entrylo1 & 2) ? 1 : 0, (entrylo1 & 2) ? 1 : 0, (entrylo1 & 1));
(entrylo1 & 1));
printk("\n"); printk("\n");
} }
} }
...@@ -99,7 +106,7 @@ void dump_tlb_all(void) ...@@ -99,7 +106,7 @@ void dump_tlb_all(void)
void dump_tlb_wired(void) void dump_tlb_wired(void)
{ {
int wired; int wired;
wired = read_c0_wired(); wired = read_c0_wired();
printk("Wired: %d", wired); printk("Wired: %d", wired);
...@@ -138,10 +145,10 @@ void dump_tlb_nonwired(void) ...@@ -138,10 +145,10 @@ void dump_tlb_nonwired(void)
void dump_list_process(struct task_struct *t, void *address) void dump_list_process(struct task_struct *t, void *address)
{ {
pgd_t *page_dir, *pgd; pgd_t *page_dir, *pgd;
pud_t *pud; pud_t *pud;
pmd_t *pmd; pmd_t *pmd;
pte_t *pte, page; pte_t *pte, page;
unsigned long addr, val; unsigned long addr, val;
addr = (unsigned long) address; addr = (unsigned long) address;
...@@ -180,14 +187,22 @@ void dump_list_process(struct task_struct *t, void *address) ...@@ -180,14 +187,22 @@ void dump_list_process(struct task_struct *t, void *address)
#endif #endif
val = pte_val(page); val = pte_val(page);
if (val & _PAGE_PRESENT) printk("present "); if (val & _PAGE_PRESENT)
if (val & _PAGE_READ) printk("read "); printk("present ");
if (val & _PAGE_WRITE) printk("write "); if (val & _PAGE_READ)
if (val & _PAGE_ACCESSED) printk("accessed "); printk("read ");
if (val & _PAGE_MODIFIED) printk("modified "); if (val & _PAGE_WRITE)
if (val & _PAGE_R4KBUG) printk("r4kbug "); printk("write ");
if (val & _PAGE_GLOBAL) printk("global "); if (val & _PAGE_ACCESSED)
if (val & _PAGE_VALID) printk("valid "); printk("accessed ");
if (val & _PAGE_MODIFIED)
printk("modified ");
if (val & _PAGE_R4KBUG)
printk("r4kbug ");
if (val & _PAGE_GLOBAL)
printk("global ");
if (val & _PAGE_VALID)
printk("valid ");
printk("\n"); printk("\n");
} }
...@@ -198,10 +213,10 @@ void dump_list_current(void *address) ...@@ -198,10 +213,10 @@ void dump_list_current(void *address)
unsigned int vtop(void *address) unsigned int vtop(void *address)
{ {
pgd_t *pgd; pgd_t *pgd;
pud_t *pud; pud_t *pud;
pmd_t *pmd; pmd_t *pmd;
pte_t *pte; pte_t *pte;
unsigned int addr, paddr; unsigned int addr, paddr;
addr = (unsigned long) address; addr = (unsigned long) address;
...@@ -220,9 +235,9 @@ void dump16(unsigned long *p) ...@@ -220,9 +235,9 @@ void dump16(unsigned long *p)
int i; int i;
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
printk("*%08lx == %08lx, ", (unsigned long)p, *p); printk("*%08lx == %08lx, ", (unsigned long) p, *p);
p++; p++;
printk("*%08lx == %08lx\n", (unsigned long)p, *p); printk("*%08lx == %08lx\n", (unsigned long) p, *p);
p++; p++;
} }
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment