Kill bitfields in ppc64 hash code
Andrew, please apply:
This patch removes the use of bitfield types from the ppc64 hash table manipulation code.
Signed-off-by David Gibson <[email protected]>
arch/ppc64/kernel/iSeries_htab.c | 50 +++++-------- arch/ppc64/kernel/pSeries_lpar.c | 49 ++++-------- arch/ppc64/mm/hash_low.S | 8 -- arch/ppc64/mm/hash_native.c | 129 +++++++++++++++------------------- arch/ppc64/mm/hash_utils.c | 16 ++-- arch/ppc64/mm/hugetlbpage.c | 16 ++-- arch/ppc64/mm/init.c | 7 + include/asm-ppc64/iSeries/HvCallHpt.h | 11 +- include/asm-ppc64/machdep.h | 6 - include/asm-ppc64/mmu.h | 83 +++++++-------------- 10 files changed, 157 insertions(+), 218 deletions(-)
arch/ppc64/kernel/iSeries_htab.c +21 -29
@@ -38,11 +38,12 @@ }static long iSeries_hpte_insert (unsigned long hpte_group,unsigned long va, -unsigned long prpn,int secondary, -unsigned long hpteflags,int bolted,int large) +unsigned long prpn,unsigned long vflags, +unsigned long rflags) {long slot; -HPTE lhpte; +hpte_t lhpte; +int secondary =0 ;/* * The hypervisor tries both primary and secondary.
@@ -50,13 +51,13 @@* it means we have already tried both primary and secondary, * so we return failure immediately. */ -if (secondary) +if (vflags &HPTE_V_SECONDARY )return -1 ;iSeries_hlock (hpte_group); slot =HvCallHpt_findValid (&lhpte, va >>PAGE_SHIFT ); -BUG_ON (lhpte.dw0.dw0.v); +BUG_ON (lhpte.v &HPTE_V_VALID );if (slot ==-1 ) {/* No available entry found in either group */ iSeries_hunlock (hpte_group);
@@ -64,19 +65,13 @@ }if (slot <0 ) {/* MSB set means secondary group */ + vflags |=HPTE_V_VALID ; secondary =1 ; slot &=0x7fffffffffffffff ; } - lhpte.dw1.dword1 =0 ; - lhpte.dw1.dw1.rpn =physRpn_to_absRpn (prpn); - lhpte.dw1.flags.flags = hpteflags; - - lhpte.dw0.dword0 =0 ; - lhpte.dw0.dw0.avpn = va >>23 ; - lhpte.dw0.dw0.h = secondary; - lhpte.dw0.dw0.bolted = bolted; - lhpte.dw0.dw0.v =1 ; + hpte.v = (va >>23 ) <<HPTE_V_AVPN_SHIFT | vflags |HPTE_V_VALID ; + hpte.r = (physRpn_to_absRpn (prpn) <<HPTE_R_RPN_SHIFT ) | rflags;/* Now fill in the actual HPTE */ HvCallHpt_addValidate (slot, secondary, &lhpte);
@@ -89,19 +84,17 @@static unsigned long iSeries_hpte_getword0 (unsigned long slot) {unsigned long dword0; -HPTE hpte; +hpte_t hpte;HvCallHpt_get (&hpte, slot); - dword0 = hpte.dw0.dword0; - -return dword0; +return hpte.v; }static long iSeries_hpte_remove (unsigned long hpte_group) {unsigned long slot_offset;int i; -HPTE lhpte; +unsigned long hpte_v;/* Pick a random slot to start at */ slot_offset =mftb () &0x7 ;
@@ -109,10 +102,9 @@iSeries_hlock (hpte_group);for (i =0 ; i <HPTES_PER_GROUP ; i++) { - lhpte.dw0.dword0 = -iSeries_hpte_getword0 (hpte_group + slot_offset); + hpte_v =iSeries_hpte_getword0 (hpte_group + slot_offset); -if (!lhpte.dw0.dw0.bolted) { +if (! (hpte_v &HPTE_V_BOLTED )) {HvCallHpt_invalidateSetSwBitsGet (hpte_group + slot_offset,0 ,0 );iSeries_hunlock (hpte_group);
@@ -137,13 +129,13 @@static long iSeries_hpte_updatepp (unsigned long slot,unsigned long newpp,unsigned long va,int large,int local) { -HPTE hpte; +hpte_t hpte;unsigned long avpn = va >>23 ;iSeries_hlock (slot);HvCallHpt_get (&hpte, slot); -if ((hpte.dw0.dw0.avpn == avpn) && (hpte.dw0.dw0.v)) { +if ((HPTE_V_AVPN_VAL (hpte.v) == avpn) && (hpte.v &HPTE_V_VALID )) {/* * Hypervisor expects bits as NPPP, which is * different from how they are mapped in our PP.
@@ -167,7 +159,7 @@*/ static long iSeries_hpte_find (unsigned long vpn) { -HPTE hpte; +hpte_t hpte;long slot;/*
@@ -177,7 +169,7 @@* 0x80000000xxxxxxxx : Entry found in secondary group, slot x */ slot =HvCallHpt_findValid (&hpte, vpn); -if (hpte.dw0.dw0.v) { +if (hpte.v &HPTE_V_VALID ) {if (slot <0 ) { slot &=0x7fffffffffffffff ; slot = -slot;
@@ -212,7 +204,7 @@static void iSeries_hpte_invalidate (unsigned long slot,unsigned long va,int large,int local) { -HPTE lhpte; +unsigned long hpte_v;unsigned long avpn = va >>23 ;unsigned long flags;
@@ -220,9 +212,9 @@iSeries_hlock (slot); - lhpte.dw0.dword0 =iSeries_hpte_getword0 (slot); + hpte_v =iSeries_hpte_getword0 (slot); -if ((lhpte.dw0.dw0.avpn == avpn) && lhpte.dw0.dw0.v) +if ((HPTE_V_AVPN_VAL (hpte_v) == avpn) && (hpte_v &HPTE_V_VALID ))HvCallHpt_invalidateSetSwBitsGet (slot,0 ,0 );iSeries_hunlock (slot);
arch/ppc64/kernel/pSeries_lpar.c +17 -32
88 lines not on this page · raw message
arch/ppc64/mm/hash_low.S +2 -6
@@ -170,9 +170,7 @@ /* Call ppc_md.hpte_insert */ ld r7,STK_PARM(r4)(r1) /* Retreive new pp bits */ mr r4,r29 /* Retreive va */ - li r6,0 /* primary slot */ - li r8,0 /* not bolted and not large */ - li r9,0 + li r6,0 /* no vflags */ _GLOBAL(htab_call_hpte_insert1) bl . /* Will be patched by htab_finish_init() */ cmpdi 0,r3,0
@@ -192,9 +190,7 @@ /* Call ppc_md.hpte_insert */ ld r7,STK_PARM(r4)(r1) /* Retreive new pp bits */ mr r4,r29 /* Retreive va */ - li r6,1 /* secondary slot */ - li r8,0 /* not bolted and not large */ - li r9,0 + li r6,HPTE_V_SECONDARY@l /* secondary slot */ _GLOBAL(htab_call_hpte_insert2) bl . /* Will be patched by htab_finish_init() */ cmpdi 0,r3,0
arch/ppc64/mm/hash_native.c +59 -70
286 lines not on this page · raw message
arch/ppc64/mm/hash_utils.c +10 -6
@@ -75,8 +75,8 @@extern unsigned long dart_tablebase;#endif /* CONFIG_U3_DART */ -HPTE *htab_address; -unsigned long htab_hash_mask; +hpte_t *htab_address; +unsigned long htab_hash_mask;extern unsigned long _SDR1;
@@ -97,11 +97,15 @@unsigned long addr;unsigned int step;unsigned long tmp_mode; +unsigned long vflags; -if (large) +if (large) { step =16 *MB ; -else + vflags =HPTE_V_BOLTED |HPTE_V_LARGE ; + }else { step =4 *KB ; + vflags =HPTE_V_BOLTED ; + }for (addr = start; addr < end; addr += step) {unsigned long vpn, hash, hpteg;
@@ -129,12 +133,12 @@if (systemcfg->platform &PLATFORM_LPAR ) ret =pSeries_lpar_hpte_insert (hpteg, va,virt_to_abs (addr) >>PAGE_SHIFT , -0 , tmp_mode,1 , large); + vflags, tmp_mode); else#endif /* CONFIG_PPC_PSERIES */ ret =native_hpte_insert (hpteg, va,virt_to_abs (addr) >>PAGE_SHIFT , -0 , tmp_mode,1 , large); + vflags, tmp_mode);if (ret ==-1 ) {ppc64_terminate_msg (0x20 ,"create_pte_mapping" );
arch/ppc64/mm/hugetlbpage.c +8 -8
@@ -583,7 +583,7 @@pte_t *ptep;unsigned long va, vpn;pte_t old_pte, new_pte; -unsigned long hpteflags, prpn; +unsigned long rflags, prpn;long slot;int err =1 ;
@@ -626,9 +626,9 @@ old_pte = *ptep; new_pte = old_pte; - hpteflags =0x2 | (! (pte_val (new_pte) & _PAGE_RW)); + rflags =0x2 | (! (pte_val (new_pte) & _PAGE_RW));/* _PAGE_EXEC -> HW_NO_EXEC since it's inverted */ - hpteflags |= ((pte_val (new_pte) & _PAGE_EXEC) ?0 :HW_NO_EXEC ); + rflags |= ((pte_val (new_pte) & _PAGE_EXEC) ?0 :HW_NO_EXEC );/* Check if pte already has an hpte (case 2) */ if (unlikely (pte_val (old_pte) & _PAGE_HASHPTE)) {
@@ -641,7 +641,7 @@ slot = (hash & htab_hash_mask) *HPTES_PER_GROUP ; slot += (pte_val (old_pte) & _PAGE_GROUP_IX) >>12 ; -if (ppc_md.hpte_updatepp (slot, hpteflags, va,1 , local) ==-1 ) +if (ppc_md.hpte_updatepp (slot, rflags, va,1 , local) ==-1 )pte_val (old_pte) &= ~_PAGE_HPTEFLAGS; }
@@ -661,10 +661,10 @@/* Add in WIMG bits */ /* XXX We should store these in the pte */ - hpteflags |= _PAGE_COHERENT; + rflags |= _PAGE_COHERENT; - slot = ppc_md.hpte_insert (hpte_group, va, prpn,0 , - hpteflags,0 ,1 ); + slot = ppc_md.hpte_insert (hpte_group, va, prpn, +HPTE_V_LARGE , rflags);/* Primary is full, try the secondary */ if (unlikely (slot ==-1 )) {
@@ -672,7 +672,7 @@ hpte_group = ((~hash & htab_hash_mask) *HPTES_PER_GROUP ) & ~0x7UL ; slot = ppc_md.hpte_insert (hpte_group, va, prpn, -1 , hpteflags,0 ,1 ); +HPTE_V_LARGE , rflags);if (slot ==-1 ) {if (mftb () &0x1 ) hpte_group = ((hash & htab_hash_mask) *HPTES_PER_GROUP ) & ~0x7UL ;
arch/ppc64/mm/init.c +4 -3
@@ -180,9 +180,10 @@ hpteg = ((hash & htab_hash_mask) *HPTES_PER_GROUP );/* Panic if a pte grpup is full */ -if (ppc_md.hpte_insert (hpteg, va, pa >>PAGE_SHIFT ,0 , - _PAGE_NO_CACHE|_PAGE_GUARDED|PP_RWXX , -1 ,0 ) ==-1 ) { +if (ppc_md.hpte_insert (hpteg, va, pa >>PAGE_SHIFT , +HPTE_V_BOLTED , + _PAGE_NO_CACHE|_PAGE_GUARDED|PP_RWXX ) + ==-1 ) {panic ("map_io_page: could not insert mapping" ); } }
include/asm-ppc64/machdep.h +2 -4
@@ -53,10 +53,8 @@long (*hpte_insert)(unsigned long hpte_group,unsigned long va,unsigned long prpn, -int secondary, -unsigned long hpteflags, -int bolted, -int large); +unsigned long vflags, +unsigned long rflags);long (*hpte_remove)(unsigned long hpte_group); void (*flush_hash_range)(unsigned long context, unsigned long number,
include/asm-ppc64/mmu.h +29 -54
118 lines not on this page · raw message
include/asm-ppc64/iSeries/HvCallHpt.h +5 -6
@@ -77,27 +77,26 @@ return compressedStatus; } -static inline u64 HvCallHpt_findValid (HPTE *hpte,u64 vpn) +static inline u64 HvCallHpt_findValid (hpte_t *hpte,u64 vpn) {return HvCall3Ret16 (HvCallHptFindValid, hpte, vpn,0 ,0 ); } -static inline u64 HvCallHpt_findNextValid (HPTE *hpte,u32 hpteIndex, +static inline u64 HvCallHpt_findNextValid (hpte_t *hpte,u32 hpteIndex,u8 bitson,u8 bitsoff) {return HvCall3Ret16 (HvCallHptFindNextValid, hpte, hpteIndex, bitson, bitsoff); } -static inline void HvCallHpt_get (HPTE *hpte,u32 hpteIndex) +static inline void HvCallHpt_get (hpte_t *hpte,u32 hpteIndex) {HvCall2Ret16 (HvCallHptGet, hpte, hpteIndex,0 ); } -static inline void HvCallHpt_addValidate (u32 hpteIndex,u32 hBit,HPTE *hpte) +static inline void HvCallHpt_addValidate (u32 hpteIndex,u32 hBit,hpte_t *hpte) { -HvCall4 (HvCallHptAddValidate, hpteIndex, hBit, (*((u64 *)hpte)), - (*(((u64 *)hpte)+1 ))); +HvCall4 (HvCallHptAddValidate, hpteIndex, hBit, hpte->v, hpte->r); }#endif /* _HVCALLHPT_H */
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/people/dgibson
Quoted 1 line · David Gibson
Andrew, please apply:
Ahem. Or perhaps the version which builds on iSeries too.
This patch removes the use of bitfield types from the ppc64 hash table manipulation code.
Signed-off-by David Gibson <[email protected]>
arch/ppc64/kernel/iSeries_htab.c +21 -30
@@ -38,11 +38,12 @@ }static long iSeries_hpte_insert (unsigned long hpte_group,unsigned long va, -unsigned long prpn,int secondary, -unsigned long hpteflags,int bolted,int large) +unsigned long prpn,unsigned long vflags, +unsigned long rflags) {long slot; -HPTE lhpte; +hpte_t lhpte; +int secondary =0 ;/* * The hypervisor tries both primary and secondary.
@@ -50,13 +51,13 @@* it means we have already tried both primary and secondary, * so we return failure immediately. */ -if (secondary) +if (vflags &HPTE_V_SECONDARY )return -1 ;iSeries_hlock (hpte_group); slot =HvCallHpt_findValid (&lhpte, va >>PAGE_SHIFT ); -BUG_ON (lhpte.dw0.dw0.v); +BUG_ON (lhpte.v &HPTE_V_VALID );if (slot ==-1 ) {/* No available entry found in either group */ iSeries_hunlock (hpte_group);
@@ -64,19 +65,13 @@ }if (slot <0 ) {/* MSB set means secondary group */ + vflags |=HPTE_V_VALID ; secondary =1 ; slot &=0x7fffffffffffffff ; } - lhpte.dw1.dword1 =0 ; - lhpte.dw1.dw1.rpn =physRpn_to_absRpn (prpn); - lhpte.dw1.flags.flags = hpteflags; - - lhpte.dw0.dword0 =0 ; - lhpte.dw0.dw0.avpn = va >>23 ; - lhpte.dw0.dw0.h = secondary; - lhpte.dw0.dw0.bolted = bolted; - lhpte.dw0.dw0.v =1 ; + lhpte.v = (va >>23 ) <<HPTE_V_AVPN_SHIFT | vflags |HPTE_V_VALID ; + lhpte.r = (physRpn_to_absRpn (prpn) <<HPTE_R_RPN_SHIFT ) | rflags;/* Now fill in the actual HPTE */ HvCallHpt_addValidate (slot, secondary, &lhpte);
@@ -88,20 +83,17 @@static unsigned long iSeries_hpte_getword0 (unsigned long slot) { -unsigned long dword0; -HPTE hpte; +hpte_t hpte;HvCallHpt_get (&hpte, slot); - dword0 = hpte.dw0.dword0; - -return dword0; +return hpte.v; }static long iSeries_hpte_remove (unsigned long hpte_group) {unsigned long slot_offset;int i; -HPTE lhpte; +unsigned long hpte_v;/* Pick a random slot to start at */ slot_offset =mftb () &0x7 ;
@@ -109,10 +101,9 @@iSeries_hlock (hpte_group);for (i =0 ; i <HPTES_PER_GROUP ; i++) { - lhpte.dw0.dword0 = -iSeries_hpte_getword0 (hpte_group + slot_offset); + hpte_v =iSeries_hpte_getword0 (hpte_group + slot_offset); -if (!lhpte.dw0.dw0.bolted) { +if (! (hpte_v &HPTE_V_BOLTED )) {HvCallHpt_invalidateSetSwBitsGet (hpte_group + slot_offset,0 ,0 );iSeries_hunlock (hpte_group);
@@ -137,13 +128,13 @@static long iSeries_hpte_updatepp (unsigned long slot,unsigned long newpp,unsigned long va,int large,int local) { -HPTE hpte; +hpte_t hpte;unsigned long avpn = va >>23 ;iSeries_hlock (slot);HvCallHpt_get (&hpte, slot); -if ((hpte.dw0.dw0.avpn == avpn) && (hpte.dw0.dw0.v)) { +if ((HPTE_V_AVPN_VAL (hpte.v) == avpn) && (hpte.v &HPTE_V_VALID )) {/* * Hypervisor expects bits as NPPP, which is * different from how they are mapped in our PP.
@@ -167,7 +158,7 @@*/ static long iSeries_hpte_find (unsigned long vpn) { -HPTE hpte; +hpte_t hpte;long slot;/*
@@ -177,7 +168,7 @@* 0x80000000xxxxxxxx : Entry found in secondary group, slot x */ slot =HvCallHpt_findValid (&hpte, vpn); -if (hpte.dw0.dw0.v) { +if (hpte.v &HPTE_V_VALID ) {if (slot <0 ) { slot &=0x7fffffffffffffff ; slot = -slot;
@@ -212,7 +203,7 @@static void iSeries_hpte_invalidate (unsigned long slot,unsigned long va,int large,int local) { -HPTE lhpte; +unsigned long hpte_v;unsigned long avpn = va >>23 ;unsigned long flags;
@@ -220,9 +211,9 @@iSeries_hlock (slot); - lhpte.dw0.dword0 =iSeries_hpte_getword0 (slot); + hpte_v =iSeries_hpte_getword0 (slot); -if ((lhpte.dw0.dw0.avpn == avpn) && lhpte.dw0.dw0.v) +if ((HPTE_V_AVPN_VAL (hpte_v) == avpn) && (hpte_v &HPTE_V_VALID ))HvCallHpt_invalidateSetSwBitsGet (slot,0 ,0 );iSeries_hunlock (slot);
arch/ppc64/kernel/pSeries_lpar.c +17 -32
88 lines not on this page · raw message
arch/ppc64/mm/hash_low.S +2 -6
@@ -170,9 +170,7 @@ /* Call ppc_md.hpte_insert */ ld r7,STK_PARM(r4)(r1) /* Retreive new pp bits */ mr r4,r29 /* Retreive va */ - li r6,0 /* primary slot */ - li r8,0 /* not bolted and not large */ - li r9,0 + li r6,0 /* no vflags */ _GLOBAL(htab_call_hpte_insert1) bl . /* Will be patched by htab_finish_init() */ cmpdi 0,r3,0
@@ -192,9 +190,7 @@ /* Call ppc_md.hpte_insert */ ld r7,STK_PARM(r4)(r1) /* Retreive new pp bits */ mr r4,r29 /* Retreive va */ - li r6,1 /* secondary slot */ - li r8,0 /* not bolted and not large */ - li r9,0 + li r6,HPTE_V_SECONDARY@l /* secondary slot */ _GLOBAL(htab_call_hpte_insert2) bl . /* Will be patched by htab_finish_init() */ cmpdi 0,r3,0
arch/ppc64/mm/hash_native.c +59 -70
286 lines not on this page · raw message
arch/ppc64/mm/hash_utils.c +10 -6
@@ -75,8 +75,8 @@extern unsigned long dart_tablebase;#endif /* CONFIG_U3_DART */ -HPTE *htab_address; -unsigned long htab_hash_mask; +hpte_t *htab_address; +unsigned long htab_hash_mask;extern unsigned long _SDR1;
@@ -97,11 +97,15 @@unsigned long addr;unsigned int step;unsigned long tmp_mode; +unsigned long vflags; -if (large) +if (large) { step =16 *MB ; -else + vflags =HPTE_V_BOLTED |HPTE_V_LARGE ; + }else { step =4 *KB ; + vflags =HPTE_V_BOLTED ; + }for (addr = start; addr < end; addr += step) {unsigned long vpn, hash, hpteg;
@@ -129,12 +133,12 @@if (systemcfg->platform &PLATFORM_LPAR ) ret =pSeries_lpar_hpte_insert (hpteg, va,virt_to_abs (addr) >>PAGE_SHIFT , -0 , tmp_mode,1 , large); + vflags, tmp_mode); else#endif /* CONFIG_PPC_PSERIES */ ret =native_hpte_insert (hpteg, va,virt_to_abs (addr) >>PAGE_SHIFT , -0 , tmp_mode,1 , large); + vflags, tmp_mode);if (ret ==-1 ) {ppc64_terminate_msg (0x20 ,"create_pte_mapping" );
arch/ppc64/mm/hugetlbpage.c +8 -8
@@ -583,7 +583,7 @@pte_t *ptep;unsigned long va, vpn;pte_t old_pte, new_pte; -unsigned long hpteflags, prpn; +unsigned long rflags, prpn;long slot;int err =1 ;
@@ -626,9 +626,9 @@ old_pte = *ptep; new_pte = old_pte; - hpteflags =0x2 | (! (pte_val (new_pte) & _PAGE_RW)); + rflags =0x2 | (! (pte_val (new_pte) & _PAGE_RW));/* _PAGE_EXEC -> HW_NO_EXEC since it's inverted */ - hpteflags |= ((pte_val (new_pte) & _PAGE_EXEC) ?0 :HW_NO_EXEC ); + rflags |= ((pte_val (new_pte) & _PAGE_EXEC) ?0 :HW_NO_EXEC );/* Check if pte already has an hpte (case 2) */ if (unlikely (pte_val (old_pte) & _PAGE_HASHPTE)) {
@@ -641,7 +641,7 @@ slot = (hash & htab_hash_mask) *HPTES_PER_GROUP ; slot += (pte_val (old_pte) & _PAGE_GROUP_IX) >>12 ; -if (ppc_md.hpte_updatepp (slot, hpteflags, va,1 , local) ==-1 ) +if (ppc_md.hpte_updatepp (slot, rflags, va,1 , local) ==-1 )pte_val (old_pte) &= ~_PAGE_HPTEFLAGS; }
@@ -661,10 +661,10 @@/* Add in WIMG bits */ /* XXX We should store these in the pte */ - hpteflags |= _PAGE_COHERENT; + rflags |= _PAGE_COHERENT; - slot = ppc_md.hpte_insert (hpte_group, va, prpn,0 , - hpteflags,0 ,1 ); + slot = ppc_md.hpte_insert (hpte_group, va, prpn, +HPTE_V_LARGE , rflags);/* Primary is full, try the secondary */ if (unlikely (slot ==-1 )) {
@@ -672,7 +672,7 @@ hpte_group = ((~hash & htab_hash_mask) *HPTES_PER_GROUP ) & ~0x7UL ; slot = ppc_md.hpte_insert (hpte_group, va, prpn, -1 , hpteflags,0 ,1 ); +HPTE_V_LARGE , rflags);if (slot ==-1 ) {if (mftb () &0x1 ) hpte_group = ((hash & htab_hash_mask) *HPTES_PER_GROUP ) & ~0x7UL ;
arch/ppc64/mm/init.c +4 -3
@@ -180,9 +180,10 @@ hpteg = ((hash & htab_hash_mask) *HPTES_PER_GROUP );/* Panic if a pte grpup is full */ -if (ppc_md.hpte_insert (hpteg, va, pa >>PAGE_SHIFT ,0 , - _PAGE_NO_CACHE|_PAGE_GUARDED|PP_RWXX , -1 ,0 ) ==-1 ) { +if (ppc_md.hpte_insert (hpteg, va, pa >>PAGE_SHIFT , +HPTE_V_BOLTED , + _PAGE_NO_CACHE|_PAGE_GUARDED|PP_RWXX ) + ==-1 ) {panic ("map_io_page: could not insert mapping" ); } }
include/asm-ppc64/machdep.h +2 -4
@@ -53,10 +53,8 @@long (*hpte_insert)(unsigned long hpte_group,unsigned long va,unsigned long prpn, -int secondary, -unsigned long hpteflags, -int bolted, -int large); +unsigned long vflags, +unsigned long rflags);long (*hpte_remove)(unsigned long hpte_group); void (*flush_hash_range)(unsigned long context, unsigned long number,
include/asm-ppc64/mmu.h +29 -54
118 lines not on this page · raw message
include/asm-ppc64/iSeries/HvCallHpt.h +5 -6
@@ -77,27 +77,26 @@ return compressedStatus; } -static inline u64 HvCallHpt_findValid (HPTE *hpte,u64 vpn) +static inline u64 HvCallHpt_findValid (hpte_t *hpte,u64 vpn) {return HvCall3Ret16 (HvCallHptFindValid, hpte, vpn,0 ,0 ); } -static inline u64 HvCallHpt_findNextValid (HPTE *hpte,u32 hpteIndex, +static inline u64 HvCallHpt_findNextValid (hpte_t *hpte,u32 hpteIndex,u8 bitson,u8 bitsoff) {return HvCall3Ret16 (HvCallHptFindNextValid, hpte, hpteIndex, bitson, bitsoff); } -static inline void HvCallHpt_get (HPTE *hpte,u32 hpteIndex) +static inline void HvCallHpt_get (hpte_t *hpte,u32 hpteIndex) {HvCall2Ret16 (HvCallHptGet, hpte, hpteIndex,0 ); } -static inline void HvCallHpt_addValidate (u32 hpteIndex,u32 hBit,HPTE *hpte) +static inline void HvCallHpt_addValidate (u32 hpteIndex,u32 hBit,hpte_t *hpte) { -HvCall4 (HvCallHptAddValidate, hpteIndex, hBit, (*((u64 *)hpte)), - (*(((u64 *)hpte)+1 ))); +HvCall4 (HvCallHptAddValidate, hpteIndex, hBit, hpte->v, hpte->r); }#endif /* _HVCALLHPT_H */
arch/ppc64/kernel/iSeries_setup.c +8 -10
@@ -503,7 +503,7 @@/* Fill in the hashed page table hash mask */ num_ptegs = hptSizePages * - (PAGE_SIZE / (sizeof (HPTE ) *HPTES_PER_GROUP )); + (PAGE_SIZE / (sizeof (hpte_t) *HPTES_PER_GROUP )); htab_hash_mask = num_ptegs -1 ;/*
@@ -618,25 +618,23 @@static void iSeries_make_pte (unsigned long va,unsigned long pa,int mode) { -HPTE local_hpte, rhpte; +hpte_t local_hpte, rhpte;unsigned long hash, vpn;long slot; vpn = va >>PAGE_SHIFT ; hash =hpt_hash (vpn,0 ); - local_hpte.dw1.dword1 = pa | mode; - local_hpte.dw0.dword0 =0 ; - local_hpte.dw0.dw0.avpn = va >>23 ; - local_hpte.dw0.dw0.bolted =1 ;/* bolted */ - local_hpte.dw0.dw0.v =1 ; + local_hpte.r = pa | mode; + local_hpte.v = ((va >>23 ) <<HPTE_V_AVPN_SHIFT ) + |HPTE_V_BOLTED |HPTE_V_VALID ; slot =HvCallHpt_findValid (&rhpte, vpn);if (slot <0 ) {/* Must find space in primary group */ panic ("hash_page: hpte already exists\n" ); } -HvCallHpt_addValidate (slot,0 , (HPTE *)&local_hpte ); +HvCallHpt_addValidate (slot,0 , &local_hpte); }/*
@@ -646,7 +644,7 @@ {unsigned long pa;unsigned long mode_rw = _PAGE_ACCESSED | _PAGE_COHERENT |PP_RWXX ; -HPTE hpte; +hpte_t hpte;for (pa = saddr; pa < eaddr ;pa +=PAGE_SIZE ) {unsigned long ea = (unsigned long )__va (pa);
@@ -659,7 +657,7 @@if (!in_kernel_text (ea)) mode_rw |=HW_NO_EXEC ; -if (hpte.dw0.dw0.v) { +if (hpte.v &HPTE_V_VALID ) {/* HPTE exists, so just bolt it */ HvCallHpt_setSwBits (slot,0x10 ,0 );/* And make sure the pp bits are correct */
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/people/dgibson
Stephen Rothwell
Acked-byQuoted 10 lines · On Fri, 8 Jul 2005 15:58:55 +1000 David Gibson <[email protected]>…
Quoted 1 line · David Gibson
Andrew, please apply:
Ahem. Or perhaps the version which builds on iSeries too.
This patch removes the use of bitfield types from the ppc64 hash table manipulation code.
Signed-off-by David Gibson <[email protected]>
Looks good to me for iSeries (built and booted).
Acked-by Stephen Rothwell <[email protected]>
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/