@@ -18,11 +18,11 @@ void dump_tlb_regs(void)
18
18
{
19
19
const int field = 2 * sizeof (unsigned long );
20
20
21
- pr_info ("Index : %0x\n" , read_csr_tlbidx ());
22
- pr_info ("PageSize : %0x\n" , read_csr_pagesize ());
23
- pr_info ("EntryHi : %0*llx\n" , field , read_csr_entryhi ());
24
- pr_info ("EntryLo0 : %0*llx\n" , field , read_csr_entrylo0 ());
25
- pr_info ("EntryLo1 : %0*llx\n" , field , read_csr_entrylo1 ());
21
+ pr_info ("Index : 0x %0x\n" , read_csr_tlbidx ());
22
+ pr_info ("PageSize : 0x %0x\n" , read_csr_pagesize ());
23
+ pr_info ("EntryHi : 0x %0*llx\n" , field , read_csr_entryhi ());
24
+ pr_info ("EntryLo0 : 0x %0*llx\n" , field , read_csr_entrylo0 ());
25
+ pr_info ("EntryLo1 : 0x %0*llx\n" , field , read_csr_entrylo1 ());
26
26
}
27
27
28
28
static void dump_tlb (int first , int last )
@@ -33,8 +33,8 @@ static void dump_tlb(int first, int last)
33
33
unsigned int s_index , s_asid ;
34
34
unsigned int pagesize , c0 , c1 , i ;
35
35
unsigned long asidmask = cpu_asid_mask (& current_cpu_data );
36
- int pwidth = 11 ;
37
- int vwidth = 11 ;
36
+ int pwidth = 16 ;
37
+ int vwidth = 16 ;
38
38
int asidwidth = DIV_ROUND_UP (ilog2 (asidmask ) + 1 , 4 );
39
39
40
40
s_entryhi = read_csr_entryhi ();
@@ -64,22 +64,22 @@ static void dump_tlb(int first, int last)
64
64
/*
65
65
* Only print entries in use
66
66
*/
67
- pr_info ("Index: %2d pgsize=%x " , i , (1 << pagesize ));
67
+ pr_info ("Index: %4d pgsize=0x %x " , i , (1 << pagesize ));
68
68
69
69
c0 = (entrylo0 & ENTRYLO_C ) >> ENTRYLO_C_SHIFT ;
70
70
c1 = (entrylo1 & ENTRYLO_C ) >> ENTRYLO_C_SHIFT ;
71
71
72
- pr_cont ("va=%0*lx asid=%0*lx" ,
72
+ pr_cont ("va=0x %0*lx asid=0x %0*lx" ,
73
73
vwidth , (entryhi & ~0x1fffUL ), asidwidth , asid & asidmask );
74
74
75
75
/* NR/NX are in awkward places, so mask them off separately */
76
76
pa = entrylo0 & ~(ENTRYLO_NR | ENTRYLO_NX );
77
77
pa = pa & PAGE_MASK ;
78
78
pr_cont ("\n\t[" );
79
- pr_cont ("ri =%d xi =%d " ,
79
+ pr_cont ("nr =%d nx =%d " ,
80
80
(entrylo0 & ENTRYLO_NR ) ? 1 : 0 ,
81
81
(entrylo0 & ENTRYLO_NX ) ? 1 : 0 );
82
- pr_cont ("pa=%0*llx c=%d d=%d v=%d g=%d plv=%lld] [" ,
82
+ pr_cont ("pa=0x %0*llx c=%d d=%d v=%d g=%d plv=%lld] [" ,
83
83
pwidth , pa , c0 ,
84
84
(entrylo0 & ENTRYLO_D ) ? 1 : 0 ,
85
85
(entrylo0 & ENTRYLO_V ) ? 1 : 0 ,
@@ -88,10 +88,10 @@ static void dump_tlb(int first, int last)
88
88
/* NR/NX are in awkward places, so mask them off separately */
89
89
pa = entrylo1 & ~(ENTRYLO_NR | ENTRYLO_NX );
90
90
pa = pa & PAGE_MASK ;
91
- pr_cont ("ri =%d xi =%d " ,
91
+ pr_cont ("nr =%d nx =%d " ,
92
92
(entrylo1 & ENTRYLO_NR ) ? 1 : 0 ,
93
93
(entrylo1 & ENTRYLO_NX ) ? 1 : 0 );
94
- pr_cont ("pa=%0*llx c=%d d=%d v=%d g=%d plv=%lld]\n" ,
94
+ pr_cont ("pa=0x %0*llx c=%d d=%d v=%d g=%d plv=%lld]\n" ,
95
95
pwidth , pa , c1 ,
96
96
(entrylo1 & ENTRYLO_D ) ? 1 : 0 ,
97
97
(entrylo1 & ENTRYLO_V ) ? 1 : 0 ,
0 commit comments