| Message ID | 7332568467307f9fc79eeef47507909ddc423c4b.1525435203.git.christophe.leroy@c-s.fr (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | Implement use of HW assistance on TLB table walk on 8xx | expand |
Christophe Leroy <christophe.leroy@c-s.fr> writes: > _PAGE_BUSY is always 0, remove it > Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> > Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> > --- > arch/powerpc/include/asm/nohash/64/pgtable.h | 10 +++------- > arch/powerpc/include/asm/nohash/pte-book3e.h | 5 ----- > 2 files changed, 3 insertions(+), 12 deletions(-) > > diff --git a/arch/powerpc/include/asm/nohash/64/pgtable.h b/arch/powerpc/include/asm/nohash/64/pgtable.h > index 4f6f5a27bfb5..c3559d7a94fb 100644 > --- a/arch/powerpc/include/asm/nohash/64/pgtable.h > +++ b/arch/powerpc/include/asm/nohash/64/pgtable.h > @@ -186,14 +186,12 @@ static inline unsigned long pte_update(struct mm_struct *mm, > > __asm__ __volatile__( > "1: ldarx %0,0,%3 # pte_update\n\ > - andi. %1,%0,%6\n\ > - bne- 1b \n\ > andc %1,%0,%4 \n\ > - or %1,%1,%7\n\ > + or %1,%1,%6\n\ > stdcx. %1,0,%3 \n\ > bne- 1b" > : "=&r" (old), "=&r" (tmp), "=m" (*ptep) > - : "r" (ptep), "r" (clr), "m" (*ptep), "i" (_PAGE_BUSY), "r" (set) > + : "r" (ptep), "r" (clr), "m" (*ptep), "r" (set) > : "cc" ); > #else > unsigned long old = pte_val(*ptep); > @@ -290,13 +288,11 @@ static inline void __ptep_set_access_flags(struct mm_struct *mm, > > __asm__ __volatile__( > "1: ldarx %0,0,%4\n\ > - andi. %1,%0,%6\n\ > - bne- 1b \n\ > or %0,%3,%0\n\ > stdcx. %0,0,%4\n\ > bne- 1b" > :"=&r" (old), "=&r" (tmp), "=m" (*ptep) > - :"r" (bits), "r" (ptep), "m" (*ptep), "i" (_PAGE_BUSY) > + :"r" (bits), "r" (ptep), "m" (*ptep) > :"cc"); > #else > unsigned long old = pte_val(*ptep); > diff --git a/arch/powerpc/include/asm/nohash/pte-book3e.h b/arch/powerpc/include/asm/nohash/pte-book3e.h > index 9ff51b4c0cac..12730b81cd98 100644 > --- a/arch/powerpc/include/asm/nohash/pte-book3e.h > +++ b/arch/powerpc/include/asm/nohash/pte-book3e.h > @@ -57,13 +57,8 @@ > #define _PAGE_USER (_PAGE_BAP_UR | _PAGE_BAP_SR) /* Can be read */ > #define _PAGE_PRIVILEGED (_PAGE_BAP_SR) > > -#define _PAGE_BUSY 0 > - > #define _PAGE_SPECIAL _PAGE_SW0 > > -/* Flags to be preserved on PTE modifications */ > -#define _PAGE_HPTEFLAGS _PAGE_BUSY > - > /* Base page size */ > #ifdef CONFIG_PPC_64K_PAGES > #define _PAGE_PSIZE _PAGE_PSIZE_64K > -- > 2.13.3
diff --git a/arch/powerpc/include/asm/nohash/64/pgtable.h b/arch/powerpc/include/asm/nohash/64/pgtable.h index 4f6f5a27bfb5..c3559d7a94fb 100644 --- a/arch/powerpc/include/asm/nohash/64/pgtable.h +++ b/arch/powerpc/include/asm/nohash/64/pgtable.h @@ -186,14 +186,12 @@ static inline unsigned long pte_update(struct mm_struct *mm, __asm__ __volatile__( "1: ldarx %0,0,%3 # pte_update\n\ - andi. %1,%0,%6\n\ - bne- 1b \n\ andc %1,%0,%4 \n\ - or %1,%1,%7\n\ + or %1,%1,%6\n\ stdcx. %1,0,%3 \n\ bne- 1b" : "=&r" (old), "=&r" (tmp), "=m" (*ptep) - : "r" (ptep), "r" (clr), "m" (*ptep), "i" (_PAGE_BUSY), "r" (set) + : "r" (ptep), "r" (clr), "m" (*ptep), "r" (set) : "cc" ); #else unsigned long old = pte_val(*ptep); @@ -290,13 +288,11 @@ static inline void __ptep_set_access_flags(struct mm_struct *mm, __asm__ __volatile__( "1: ldarx %0,0,%4\n\ - andi. %1,%0,%6\n\ - bne- 1b \n\ or %0,%3,%0\n\ stdcx. %0,0,%4\n\ bne- 1b" :"=&r" (old), "=&r" (tmp), "=m" (*ptep) - :"r" (bits), "r" (ptep), "m" (*ptep), "i" (_PAGE_BUSY) + :"r" (bits), "r" (ptep), "m" (*ptep) :"cc"); #else unsigned long old = pte_val(*ptep); diff --git a/arch/powerpc/include/asm/nohash/pte-book3e.h b/arch/powerpc/include/asm/nohash/pte-book3e.h index 9ff51b4c0cac..12730b81cd98 100644 --- a/arch/powerpc/include/asm/nohash/pte-book3e.h +++ b/arch/powerpc/include/asm/nohash/pte-book3e.h @@ -57,13 +57,8 @@ #define _PAGE_USER (_PAGE_BAP_UR | _PAGE_BAP_SR) /* Can be read */ #define _PAGE_PRIVILEGED (_PAGE_BAP_SR) -#define _PAGE_BUSY 0 - #define _PAGE_SPECIAL _PAGE_SW0 -/* Flags to be preserved on PTE modifications */ -#define _PAGE_HPTEFLAGS _PAGE_BUSY - /* Base page size */ #ifdef CONFIG_PPC_64K_PAGES #define _PAGE_PSIZE _PAGE_PSIZE_64K
_PAGE_BUSY is always 0, remove it Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> --- arch/powerpc/include/asm/nohash/64/pgtable.h | 10 +++------- arch/powerpc/include/asm/nohash/pte-book3e.h | 5 ----- 2 files changed, 3 insertions(+), 12 deletions(-)