From: Balbir Singh <bsingharora@gmail•com>
To: linuxppc-dev@lists•ozlabs.org, mpe@ellerman•id.au
Cc: naveen.n.rao@linux•vnet.ibm.com, ananth@linux•vnet.ibm.com,
christophe.leroy@c-s•fr, paulus@samba•org, rashmica.g@gmail•com,
Balbir Singh <bsingharora@gmail•com>
Subject: [PATCH v1 5/8] powerpc/platform/pseries/lpar: Fix updatepp and updateboltedpp
Date: Thu, 25 May 2017 13:36:47 +1000 [thread overview]
Message-ID: <20170525033650.10891-6-bsingharora@gmail.com> (raw)
In-Reply-To: <20170525033650.10891-1-bsingharora@gmail.com>
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
Signed-off-by: Balbir Singh <bsingharora@gmail•com>
---
arch/powerpc/platforms/pseries/lpar.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 6541d0b..83db643 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,11 @@ 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.
+ */
+ flags = ((newpp & HPTE_R_PP0) >> 55) | (newpp & 7) | H_AVPN;
lpar_rc = plpar_pte_protect(flags, slot, want_v);
if (lpar_rc == H_NOT_FOUND) {
@@ -379,7 +384,11 @@ 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.
+ */
+ flags = ((newpp & HPTE_R_PP0) >> 55) | (newpp & 7);
lpar_rc = plpar_pte_protect(flags, slot, 0);
BUG_ON(lpar_rc != H_SUCCESS);
--
2.9.3
next prev parent reply other threads:[~2017-05-25 3:37 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-25 3:36 [PATCH v1 0/8] Enable STRICT_KERNEL_RWX Balbir Singh
2017-05-25 3:36 ` [PATCH v1 1/8] powerpc/lib/code-patching: Enhance code patching Balbir Singh
2017-05-25 9:11 ` kbuild test robot
2017-05-28 14:29 ` christophe leroy
2017-05-28 22:58 ` Balbir Singh
2017-05-29 6:55 ` Christophe LEROY
2017-05-28 15:59 ` christophe leroy
2017-05-28 22:50 ` Balbir Singh
2017-05-29 5:50 ` Christophe LEROY
2017-05-28 18:00 ` christophe leroy
2017-05-28 22:15 ` Balbir Singh
2017-05-25 3:36 ` [PATCH v1 2/8] powerpc/kprobes: Move kprobes over to patch_instruction Balbir Singh
2017-05-29 8:50 ` Christophe LEROY
2017-05-29 22:11 ` Balbir Singh
2017-05-25 3:36 ` [PATCH v1 3/8] powerpc/xmon: Add patch_instruction supporf for xmon Balbir Singh
2017-05-25 3:36 ` [PATCH v1 4/8] powerpc/vmlinux.lds: Align __init_begin to 16M Balbir Singh
2017-05-25 3:36 ` Balbir Singh [this message]
2017-05-25 3:36 ` [PATCH v1 6/8] powerpc/mm/hash: Implement mark_rodata_ro() for hash Balbir Singh
2017-05-25 3:36 ` [PATCH v1 7/8] powerpc/Kconfig: Enable STRICT_KERNEL_RWX Balbir Singh
2017-05-25 16:45 ` kbuild test robot
2017-05-29 8:00 ` Christophe LEROY
2017-06-03 5:42 ` Balbir Singh
2017-06-05 5:46 ` Michael Ellerman
2017-05-25 3:36 ` [PATCH v1 8/8] powerpc/mm/ptdump: Dump the first entry of the linear mapping as well Balbir Singh
2017-06-05 10:21 ` [v1, " Michael Ellerman
2017-05-25 6:57 ` [PATCH v1 0/8] Enable STRICT_KERNEL_RWX Balbir Singh
2017-05-30 14:32 ` Naveen N. Rao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170525033650.10891-6-bsingharora@gmail.com \
--to=bsingharora@gmail$(echo .)com \
--cc=ananth@linux$(echo .)vnet.ibm.com \
--cc=christophe.leroy@c-s$(echo .)fr \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mpe@ellerman$(echo .)id.au \
--cc=naveen.n.rao@linux$(echo .)vnet.ibm.com \
--cc=paulus@samba$(echo .)org \
--cc=rashmica.g@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox