This is a note to let you know that I've just added the patch titled
powerpc/64s: Fix conversion of slb_miss_common to use RFI_TO_USER/KERNEL
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-64s-fix-conversion-of-slb_miss_common-to-use-rfi_to_user-kernel.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 <stable@xxxxxxxxxxxxxxx> know about it.
>From mpe@xxxxxxxxxxxxxx Fri Feb 23 12:34:52 2018
From: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
Date: Thu, 22 Feb 2018 23:35:43 +1100
Subject: powerpc/64s: Fix conversion of slb_miss_common to use RFI_TO_USER/KERNEL
To: stable@xxxxxxxxxxxxxxx, greg@xxxxxxxxx
Cc: npiggin@xxxxxxxxx, linuxppc-dev@xxxxxxxxxx, linux@xxxxxxxxxxxx, corsac@xxxxxxxxxx
Message-ID: <20180222123545.8946-1-mpe@xxxxxxxxxxxxxx>
From: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
The back port of commit c7305645eb0c ("powerpc/64s: Convert
slb_miss_common to use RFI_TO_USER/KERNEL") missed a hunk needed to
restore cr6.
Fixes: 48cc95d4e4d6 ("powerpc/64s: Convert slb_miss_common to use RFI_TO_USER/KERNEL")
Signed-off-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/powerpc/kernel/exceptions-64s.S | 1 +
1 file changed, 1 insertion(+)
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -680,6 +680,7 @@ END_MMU_FTR_SECTION_IFCLR(MMU_FTR_TYPE_R
.machine push
.machine "power4"
mtcrf 0x80,r9
+ mtcrf 0x02,r9 /* I/D indication is in cr6 */
mtcrf 0x01,r9 /* slb_allocate uses cr0 and cr7 */
.machine pop
Patches currently in stable-queue which might be from mpe@xxxxxxxxxxxxxx are
queue-4.9/powerpc-64s-fix-conversion-of-slb_miss_common-to-use-rfi_to_user-kernel.patch
queue-4.9/powerpc-perf-fix-oops-when-grouping-different-pmu-events.patch