| From 4ab2537c4204b976e4ca350bbdc193b4649cad28 Mon Sep 17 00:00:00 2001 |
| From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> |
| Date: Thu, 8 Dec 2016 09:12:13 +0530 |
| Subject: [PATCH] powerpc/mm: Fixup wrong LPCR_VRMASD value |
| |
| 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 <linuxram@us.ibm.com> |
| Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> |
| Signed-off-by: Jia He <hejianet@gmail.com> |
| Acked-by: Paul Mackerras <paulus@ozlabs.org> |
| Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> |
| |
| diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h |
| index 0d4531aa2052..818c4e878e60 100644 |
| --- a/arch/powerpc/include/asm/reg.h |
| +++ b/arch/powerpc/include/asm/reg.h |
| @@ -338,7 +338,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) |
| -- |
| 2.12.0 |
| |
