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: Nicholas Piggin <npiggin@gmail.com>
[mpe: Use "ISA_3_0" rather than "ARCH_300"]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/include/asm/ppc-opcode.h b/arch/powerpc/include/asm/ppc-opcode.h
index 23f7ed796f38829a054b5c0851b04e581990bcbf..14f43b6cf7ec642840171a73673291b560125869 100644 (file)
--- a/arch/powerpc/include/asm/ppc-opcode.h
+++ b/arch/powerpc/include/asm/ppc-opcode.h
@@ -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) | \

diff --git a/arch/powerpc/kernel/mce_power.c b/arch/powerpc/kernel/mce_power.c
index b5e876efe864afde8f9ef0a6a64c1e39f57d0550..451f3e90e9581b7bceece5f8a09b7731b99ac468 100644 (file)
--- a/arch/powerpc/kernel/mce_power.c
+++ b/arch/powerpc/kernel/mce_power.c
@@ -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

diff --git a/arch/powerpc/kvm/book3s_hv_builtin.c b/arch/powerpc/kvm/book3s_hv_builtin.c
index a46286f73eec0109861bb55773dd319b5f6473f8..ca4f006abd771cd7cd535179ba584ea0fa32d117 100644 (file)
--- a/arch/powerpc/kvm/book3s_hv_builtin.c
+++ b/arch/powerpc/kvm/book3s_hv_builtin.c
@@ -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,

diff --git a/arch/powerpc/mm/book3s64/hash_native.c b/arch/powerpc/mm/book3s64/hash_native.c
index 47caecdbbbac6925924ba5cb18231b9ad8de74d0..0b447d96b911246d1e8f59dd3f377027ddd51f53 100644 (file)
--- a/arch/powerpc/mm/book3s64/hash_native.c
+++ b/arch/powerpc/mm/book3s64/hash_native.c
@@ -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)

diff --git a/arch/powerpc/mm/book3s64/radix_tlb.c b/arch/powerpc/mm/book3s64/radix_tlb.c
index 4d841369399f439915b863241a08a143c8f6f98f..7539c714438e579db5f46e4444e1e28448f753f7 100644 (file)
--- a/arch/powerpc/mm/book3s64/radix_tlb.c
+++ b/arch/powerpc/mm/book3s64/radix_tlb.c
@@ -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");
 }
 
 

diff --git a/arch/powerpc/platforms/powernv/idle.c b/arch/powerpc/platforms/powernv/idle.c
index 77f2e0a4ee3723bfa55060867adfe23a3ef6a95b..f9ab8951076621de957351a04aeca2392e115752 100644 (file)
--- a/arch/powerpc/platforms/powernv/idle.c
+++ b/arch/powerpc/platforms/powernv/idle.c
@@ -720,7 +720,7 @@ static unsigned long power9_idle_stop(unsigned long psscr, bool mmu_on)
                 * to reload MMCR0 (see mmcr0 comment above).
                 */
                if (!cpu_has_feature(CPU_FTR_POWER9_DD2_1)) {
-                       asm volatile(PPC_INVALIDATE_ERAT);
+                       asm volatile(PPC_ISA_3_0_INVALIDATE_ERAT);
                        mtspr(SPRN_MMCR0, mmcr0);
                }