Commit fe7946ce authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

powerpc/64s: Rename PPC_INVALIDATE_ERAT to PPC_ISA_3_0_INVALIDATE_ERAT 



This makes it clear to the caller that it can only be used on POWER9
and later CPUs.

Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
[mpe: Use "ISA_3_0" rather than "ARCH_300"]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 293c2e27

arch/powerpc/include/asm/ppc-opcode.h

+1 −1
Original line number Diff line number Diff line
@@ -591,7 +591,7 @@ 


#define PPC_SLBIA(IH)	stringify_in_c(.long PPC_INST_SLBIA | \

				       ((IH & 0x7) << 21))

#define PPC_INVALIDATE_ERAT	PPC_SLBIA(7)

#define PPC_ISA_3_0_INVALIDATE_ERAT	PPC_SLBIA(7)



#define VCMPEQUD_RC(vrt, vra, vrb)	stringify_in_c(.long PPC_INST_VCMPEQUD | \

			      ___PPC_RT(vrt) | ___PPC_RA(vra) | \

arch/powerpc/kernel/mce_power.c

+1 −2
Original line number Diff line number Diff line
@@ -95,8 +95,7 @@ static void flush_erat(void) 
		return;

	}

#endif

	/* PPC_INVALIDATE_ERAT can only be used on ISA v3 and newer */

	asm volatile(PPC_INVALIDATE_ERAT : : :"memory");

	asm volatile(PPC_ISA_3_0_INVALIDATE_ERAT : : :"memory");

}



#define MCE_FLUSH_SLB 1

arch/powerpc/kvm/book3s_hv_builtin.c

+1 −1
Original line number Diff line number Diff line
@@ -833,7 +833,7 @@ static void flush_guest_tlb(struct kvm *kvm) 
		}

	}

	asm volatile("ptesync": : :"memory");

	asm volatile(PPC_INVALIDATE_ERAT : : :"memory");

	asm volatile(PPC_ISA_3_0_INVALIDATE_ERAT : : :"memory");

}



void kvmppc_check_need_tlb_flush(struct kvm *kvm, int pcpu,

arch/powerpc/mm/book3s64/hash_native.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static void tlbiel_all_isa300(unsigned int num_sets, unsigned int is) 


	asm volatile("ptesync": : :"memory");



	asm volatile(PPC_INVALIDATE_ERAT "; isync" : : :"memory");

	asm volatile(PPC_ISA_3_0_INVALIDATE_ERAT "; isync" : : :"memory");

}



void hash__tlbiel_all(unsigned int action)

arch/powerpc/mm/book3s64/radix_tlb.c

+4 −4
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ void radix__tlbiel_all(unsigned int action) 
	else

		WARN(1, "%s called on pre-POWER9 CPU\n", __func__);



	asm volatile(PPC_INVALIDATE_ERAT "; isync" : : :"memory");

	asm volatile(PPC_ISA_3_0_INVALIDATE_ERAT "; isync" : : :"memory");

}



static __always_inline void __tlbiel_pid(unsigned long pid, int set,
@@ -262,7 +262,7 @@ static inline void _tlbiel_pid(unsigned long pid, unsigned long ric) 
		__tlbiel_pid(pid, set, RIC_FLUSH_TLB);



	asm volatile("ptesync": : :"memory");

	asm volatile(PPC_INVALIDATE_ERAT "; isync" : : :"memory");

	asm volatile(PPC_ISA_3_0_INVALIDATE_ERAT "; isync" : : :"memory");

}



static inline void _tlbie_pid(unsigned long pid, unsigned long ric)
@@ -314,7 +314,7 @@ static inline void _tlbiel_lpid(unsigned long lpid, unsigned long ric) 
		__tlbiel_lpid(lpid, set, RIC_FLUSH_TLB);



	asm volatile("ptesync": : :"memory");

	asm volatile(PPC_INVALIDATE_ERAT "; isync" : : :"memory");

	asm volatile(PPC_ISA_3_0_INVALIDATE_ERAT "; isync" : : :"memory");

}



static inline void _tlbie_lpid(unsigned long lpid, unsigned long ric)
@@ -366,7 +366,7 @@ static inline void _tlbiel_lpid_guest(unsigned long lpid, unsigned long ric) 
		__tlbiel_lpid_guest(lpid, set, RIC_FLUSH_TLB);



	asm volatile("ptesync": : :"memory");

	asm volatile(PPC_INVALIDATE_ERAT : : :"memory");

	asm volatile(PPC_ISA_3_0_INVALIDATE_ERAT : : :"memory");

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE