4.9-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Aneesh Kumar K.V <[email protected]>

commit 4ab2537c4204b976e4ca350bbdc193b4649cad28 upstream.

In commit a4b349540a26af ("powerpc/mm: Cleanup LPCR defines") we updated
LPCR_VRMASD wrongly as below.

-#define   LPCR_VRMASD  (0x1ful << (63-16))
+#define   LPCR_VRMASD_SH       47
+#define   LPCR_VRMASD          (ASM_CONST(1) << LPCR_VRMASD_SH)

We initialize the VRMA bits in LPCR to 0x00 in kvm. Hence using a
different mask value as above while updating lpcr should not have any
impact.

This patch updates it to the correct value.

Fixes: a4b349540a26 ("powerpc/mm: Cleanup LPCR defines")
Reported-by: Ram Pai <[email protected]>
Signed-off-by: Aneesh Kumar K.V <[email protected]>
Signed-off-by: Jia He <[email protected]>
Acked-by: Paul Mackerras <[email protected]>
Signed-off-by: Michael Ellerman <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 arch/powerpc/include/asm/reg.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@ -337,7 +337,7 @@
 #define   LPCR_DPFD_SH         52
 #define   LPCR_DPFD            (ASM_CONST(7) << LPCR_DPFD_SH)
 #define   LPCR_VRMASD_SH       47
-#define   LPCR_VRMASD          (ASM_CONST(1) << LPCR_VRMASD_SH)
+#define   LPCR_VRMASD          (ASM_CONST(0x1f) << LPCR_VRMASD_SH)
 #define   LPCR_VRMA_L          ASM_CONST(0x0008000000000000)
 #define   LPCR_VRMA_LP0                ASM_CONST(0x0001000000000000)
 #define   LPCR_VRMA_LP1                ASM_CONST(0x0000800000000000)


Reply via email to