[PATCH v5 3/7] powerpc/platform/pseries/lpar: Fix updatepp and updateboltedpp
From: Balbir Singh <bsingharora@gmail.com>
Date: 2017-06-28 17:04:42
Subsystem:
linux for powerpc (32-bit and 64-bit), the rest · Maintainers:
Madhavan Srinivasan, Linus Torvalds
PAPR has pp0 in bit 55, currently we assumed that bit pp0 is bit 0 (all bits in IBM order). This patch fixes the pp0 bits for both these routines that use H_PROTECT. Fixes (e58e87a powerpc/mm: Update _PAGE_KERNEL_RO) Signed-off-by: Balbir Singh <bsingharora@gmail.com> --- arch/powerpc/platforms/pseries/lpar.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 6541d0b..2d36571 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c@@ -301,7 +301,7 @@ static long pSeries_lpar_hpte_updatepp(unsigned long slot, int ssize, unsigned long inv_flags) { unsigned long lpar_rc; - unsigned long flags = (newpp & 7) | H_AVPN; + unsigned long flags; unsigned long want_v; want_v = hpte_encode_avpn(vpn, psize, ssize);
@@ -309,6 +309,15 @@ static long pSeries_lpar_hpte_updatepp(unsigned long slot, pr_devel(" update: avpnv=%016lx, hash=%016lx, f=%lx, psize: %d ...", want_v, slot, flags, psize); + /* + * Move pp0 and set the mask, pp0 is bit 55 + * We ignore the keys for now. + */ + if (mmu_has_feature(MMU_FTR_KERNEL_RO)) + flags = ((newpp & HPTE_R_PP0) >> 55) | (newpp & 7) | H_AVPN; + else + flags = (newpp & 7) | H_AVPN; + lpar_rc = plpar_pte_protect(flags, slot, want_v); if (lpar_rc == H_NOT_FOUND) {
@@ -379,7 +388,15 @@ static void pSeries_lpar_hpte_updateboltedpp(unsigned long newpp, slot = pSeries_lpar_hpte_find(vpn, psize, ssize); BUG_ON(slot == -1); - flags = newpp & 7; + /* + * Move pp0 and set the mask, pp0 is bit 55 + * We ignore the keys for now. + */ + if (mmu_has_feature(MMU_FTR_KERNEL_RO)) + flags = ((newpp & HPTE_R_PP0) >> 55) | (newpp & 7); + else + flags = (newpp & 7); + lpar_rc = plpar_pte_protect(flags, slot, 0); BUG_ON(lpar_rc != H_SUCCESS);
--
2.9.4