Patch "powerpc/mm/radix: Update ERAT flushes when invalidating TLB" has been added to the 4.9-stable tree

This is a note to let you know that I've just added the patch titled

powerpc/mm/radix: Update ERAT flushes when invalidating TLB

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
powerpc-mm-radix-update-erat-flushes-when-invalidating-tlb.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Benjamin Herrenschmidt <[email protected]>
Date: Mon, 6 Feb 2017 13:05:16 +1100
Subject: powerpc/mm/radix: Update ERAT flushes when invalidating TLB

From: Benjamin Herrenschmidt <[email protected]>

commit 90c1e3c2fafec57fcb55b5d69bcf293b1a5fc8b3 upstream.

Three tiny changes to the ERAT flushing logic: First don't make it depend on DD1. It hasn't been decided yet but we might run DD2 in a mode that also requires explicit flushes for performance reasons so make it unconditional. We also add a missing isync, and finally remove the flush from _tlbiel_va as it is only necessary for congruence-class invalidations (PID, LPID and full TLB), not targetted invalidations.

---
 arch/powerpc/mm/tlb-radix.c |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

@@ -50,9 +50,7 @@ static inline void _tlbiel_pid(unsigned
 	for (set = 0; set < POWER9_TLB_SETS_RADIX ; set++) {
 		__tlbiel_pid(pid, set, ric);
 	}
-	if (cpu_has_feature(CPU_FTR_POWER9_DD1))
-		asm volatile(PPC_INVALIDATE_ERAT : : :"memory");
-	return;
+	asm volatile(PPC_INVALIDATE_ERAT "; isync" : : :"memory");
 }
 
 static inline void _tlbie_pid(unsigned long pid, unsigned long ric)

@@ -85,8 +83,6 @@ static inline void _tlbiel_va(unsigned l
 	asm volatile(PPC_TLBIEL(%0, %4, %3, %2, %1)
 		     : : "r"(rb), "i"(r), "i"(prs), "i"(ric), "r"(rs) : "memory");
 	asm volatile("ptesync": : :"memory");
-	if (cpu_has_feature(CPU_FTR_POWER9_DD1))
-		asm volatile(PPC_INVALIDATE_ERAT : : :"memory");
 }
 
 static inline void _tlbie_va(unsigned long va, unsigned long pid,

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/powerpc-mm-radix-update-erat-flushes-when-invalidating-tlb.patch queue-4.9/powerpc-powernv-fix-cpu-hotplug-to-handle-waking-on-hvi.patch