Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d3ca7e7 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Michael Ellerman
Browse files

powerpc/mm: mark more tlb functions as __always_inline 



With CONFIG_OPTIMIZE_INLINING enabled, Laura Abbott reported error
with gcc 9.1.1:

  arch/powerpc/mm/book3s64/radix_tlb.c: In function '_tlbiel_pid':
  arch/powerpc/mm/book3s64/radix_tlb.c:104:2: warning: asm operand 3 probably doesn't match constraints
    104 |  asm volatile(PPC_TLBIEL(%0, %4, %3, %2, %1)
        |  ^~~
  arch/powerpc/mm/book3s64/radix_tlb.c:104:2: error: impossible constraint in 'asm'

Fixing _tlbiel_pid() is enough to address the warning above, but I
inlined more functions to fix all potential issues.

To meet the "i" (immediate) constraint for the asm operands, functions
propagating "ric" must be always inlined.

Fixes: 9012d011 ("compiler: allow all arches to enable CONFIG_OPTIMIZE_INLINING")
Reported-by: default avatarLaura Abbott <labbott@redhat.com>
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 2200bbec

arch/powerpc/mm/book3s64/hash_native.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static inline void tlbiel_hash_set_isa206(unsigned int set, unsigned int is) 
 * tlbiel instruction for hash, set invalidation

 * i.e., r=1 and is=01 or is=10 or is=11

 */

static inline void tlbiel_hash_set_isa300(unsigned int set, unsigned int is,

static __always_inline void tlbiel_hash_set_isa300(unsigned int set, unsigned int is,

					unsigned int pid,

					unsigned int ric, unsigned int prs)

{

arch/powerpc/mm/book3s64/radix_tlb.c

+16 −16
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
 * tlbiel instruction for radix, set invalidation

 * i.e., r=1 and is=01 or is=10 or is=11

 */

static inline void tlbiel_radix_set_isa300(unsigned int set, unsigned int is,

static __always_inline void tlbiel_radix_set_isa300(unsigned int set, unsigned int is,

					unsigned int pid,

					unsigned int ric, unsigned int prs)

{
@@ -150,7 +150,7 @@ static __always_inline void __tlbie_lpid(unsigned long lpid, unsigned long ric) 
	trace_tlbie(lpid, 0, rb, rs, ric, prs, r);

}



static inline void __tlbiel_lpid_guest(unsigned long lpid, int set,

static __always_inline void __tlbiel_lpid_guest(unsigned long lpid, int set,

						unsigned long ric)

{

	unsigned long rb,rs,prs,r;
@@ -167,7 +167,7 @@ static inline void __tlbiel_lpid_guest(unsigned long lpid, int set, 
}





static inline void __tlbiel_va(unsigned long va, unsigned long pid,

static __always_inline void __tlbiel_va(unsigned long va, unsigned long pid,

					unsigned long ap, unsigned long ric)

{

	unsigned long rb,rs,prs,r;
@@ -183,7 +183,7 @@ static inline void __tlbiel_va(unsigned long va, unsigned long pid, 
	trace_tlbie(0, 1, rb, rs, ric, prs, r);

}



static inline void __tlbie_va(unsigned long va, unsigned long pid,

static __always_inline void __tlbie_va(unsigned long va, unsigned long pid,

				       unsigned long ap, unsigned long ric)

{

	unsigned long rb,rs,prs,r;
@@ -199,7 +199,7 @@ static inline void __tlbie_va(unsigned long va, unsigned long pid, 
	trace_tlbie(0, 0, rb, rs, ric, prs, r);

}



static inline void __tlbie_lpid_va(unsigned long va, unsigned long lpid,

static __always_inline void __tlbie_lpid_va(unsigned long va, unsigned long lpid,

					    unsigned long ap, unsigned long ric)

{

	unsigned long rb,rs,prs,r;
@@ -239,7 +239,7 @@ static inline void fixup_tlbie_lpid(unsigned long lpid) 
/*

 * We use 128 set in radix mode and 256 set in hpt mode.

 */

static inline void _tlbiel_pid(unsigned long pid, unsigned long ric)

static __always_inline void _tlbiel_pid(unsigned long pid, unsigned long ric)

{

	int set;
@@ -341,7 +341,7 @@ static inline void _tlbie_lpid(unsigned long lpid, unsigned long ric) 
	asm volatile("eieio; tlbsync; ptesync": : :"memory");

}



static inline void _tlbiel_lpid_guest(unsigned long lpid, unsigned long ric)

static __always_inline void _tlbiel_lpid_guest(unsigned long lpid, unsigned long ric)

{

	int set;
@@ -381,7 +381,7 @@ static inline void __tlbiel_va_range(unsigned long start, unsigned long end, 
		__tlbiel_va(addr, pid, ap, RIC_FLUSH_TLB);

}



static inline void _tlbiel_va(unsigned long va, unsigned long pid,

static __always_inline void _tlbiel_va(unsigned long va, unsigned long pid,

				       unsigned long psize, unsigned long ric)

{

	unsigned long ap = mmu_get_ap(psize);
@@ -413,7 +413,7 @@ static inline void __tlbie_va_range(unsigned long start, unsigned long end, 
		__tlbie_va(addr, pid, ap, RIC_FLUSH_TLB);

}



static inline void _tlbie_va(unsigned long va, unsigned long pid,

static __always_inline void _tlbie_va(unsigned long va, unsigned long pid,

				      unsigned long psize, unsigned long ric)

{

	unsigned long ap = mmu_get_ap(psize);
@@ -424,7 +424,7 @@ static inline void _tlbie_va(unsigned long va, unsigned long pid, 
	asm volatile("eieio; tlbsync; ptesync": : :"memory");

}



static inline void _tlbie_lpid_va(unsigned long va, unsigned long lpid,

static __always_inline void _tlbie_lpid_va(unsigned long va, unsigned long lpid,

			      unsigned long psize, unsigned long ric)

{

	unsigned long ap = mmu_get_ap(psize);