From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
To: benh@kernel.crashing.org, paulus@samba.org
Cc: linuxppc-dev@lists.ozlabs.org,
"Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Subject: [RFC PATCH 09/17] powerpc/mm: Use encode avpn where we need only avpn values
Date: Mon, 18 Feb 2013 15:58:07 +0530 [thread overview]
Message-ID: <1361183295-6958-10-git-send-email-aneesh.kumar@linux.vnet.ibm.com> (raw)
In-Reply-To: <1361183295-6958-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com>
From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
---
arch/powerpc/include/asm/mmu-hash64.h | 8 ++++----
arch/powerpc/mm/hash_native_64.c | 10 +++++-----
arch/powerpc/platforms/pseries/lpar.c | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/powerpc/include/asm/mmu-hash64.h b/arch/powerpc/include/asm/mmu-hash64.h
index 6ec65b6..aeeee5e 100644
--- a/arch/powerpc/include/asm/mmu-hash64.h
+++ b/arch/powerpc/include/asm/mmu-hash64.h
@@ -237,14 +237,14 @@ static inline unsigned long hpte_encode_avpn(unsigned long vpn, int psize,
/*
* This function sets the AVPN and L fields of the HPTE appropriately
- * for the page size
+ * using the base page size and actual page size.
*/
-static inline unsigned long hpte_encode_v(unsigned long vpn,
- int psize, int ssize)
+static inline unsigned long hpte_encode_v(unsigned long vpn, int psize,
+ int apsize, int ssize)
{
unsigned long v;
v = hpte_encode_avpn(vpn, psize, ssize);
- if (psize != MMU_PAGE_4K)
+ if (apsize != MMU_PAGE_4K)
v |= HPTE_V_LARGE;
return v;
}
diff --git a/arch/powerpc/mm/hash_native_64.c b/arch/powerpc/mm/hash_native_64.c
index da46cd3..4cf361f 100644
--- a/arch/powerpc/mm/hash_native_64.c
+++ b/arch/powerpc/mm/hash_native_64.c
@@ -216,7 +216,7 @@ static long native_hpte_insert(unsigned long hpte_group, unsigned long vpn,
if (i == HPTES_PER_GROUP)
return -1;
- hpte_v = hpte_encode_v(vpn, psize, ssize) | vflags | HPTE_V_VALID;
+ hpte_v = hpte_encode_v(vpn, psize, apsize, ssize) | vflags | HPTE_V_VALID;
hpte_r = hpte_encode_r(pa, psize, apsize) | rflags;
if (!(vflags & HPTE_V_BOLTED)) {
@@ -327,7 +327,7 @@ static long native_hpte_updatepp(unsigned long slot, unsigned long newpp,
int ret = 0;
int actual_psize;
- want_v = hpte_encode_v(vpn, psize, ssize);
+ want_v = hpte_encode_avpn(vpn, psize, ssize);
DBG_LOW(" update(vpn=%016lx, avpnv=%016lx, group=%lx, newpp=%lx)",
vpn, want_v & HPTE_V_AVPN, slot, newpp);
@@ -364,7 +364,7 @@ static long native_hpte_find(unsigned long vpn, int psize, int ssize)
unsigned long want_v, hpte_v;
hash = hpt_hash(vpn, mmu_psize_defs[psize].shift, ssize);
- want_v = hpte_encode_v(vpn, psize, ssize);
+ want_v = hpte_encode_avpn(vpn, psize, ssize);
/* Bolted mappings are only ever in the primary group */
slot = (hash & htab_hash_mask) * HPTES_PER_GROUP;
@@ -427,7 +427,7 @@ static void native_hpte_invalidate(unsigned long slot, unsigned long vpn,
DBG_LOW(" invalidate(vpn=%016lx, hash: %lx)\n", vpn, slot);
- want_v = hpte_encode_v(vpn, psize, ssize);
+ want_v = hpte_encode_avpn(vpn, psize, ssize);
native_lock_hpte(hptep);
hpte_v = hptep->v;
@@ -599,7 +599,7 @@ static void native_flush_hash_range(unsigned long number, int local)
slot = (hash & htab_hash_mask) * HPTES_PER_GROUP;
slot += hidx & _PTEIDX_GROUP_IX;
hptep = htab_address + slot;
- want_v = hpte_encode_v(vpn, psize, ssize);
+ want_v = hpte_encode_avpn(vpn, psize, ssize);
native_lock_hpte(hptep);
hpte_v = hptep->v;
if (!HPTE_V_COMPARE(hpte_v, want_v) ||
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 9f99847..ca9c2bb 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -121,7 +121,7 @@ static long pSeries_lpar_hpte_insert(unsigned long hpte_group,
"pa=%016lx, rflags=%lx, vflags=%lx, psize=%d)\n",
hpte_group, vpn, pa, rflags, vflags, psize);
- hpte_v = hpte_encode_v(vpn, psize, ssize) | vflags | HPTE_V_VALID;
+ hpte_v = hpte_encode_v(vpn, psize, apsize, ssize) | vflags | HPTE_V_VALID;
hpte_r = hpte_encode_r(pa, psize, apsize) | rflags;
if (!(vflags & HPTE_V_BOLTED))
--
1.7.10
next prev parent reply other threads:[~2013-02-18 10:28 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-18 10:27 [RFC PATCH 00/17] THP support for PPC64 Aneesh Kumar K.V
2013-02-18 10:27 ` [RFC PATCH 01/17] powerpc: Don't hard code the size of pte page Aneesh Kumar K.V
2013-02-18 10:28 ` [RFC PATCH 02/17] arch/powerpc: Reduce the PTE_INDEX_SIZE Aneesh Kumar K.V
2013-02-18 10:28 ` [RFC PATCH 03/17] powerpc: Reduce PTE table memory wastage Aneesh Kumar K.V
2013-02-18 10:28 ` [RFC PATCH 04/17] mm/THP: Add pmd args to pgtable deposit and withdraw APIs Aneesh Kumar K.V
2013-02-18 10:28 ` [RFC PATCH 05/17] powerpc: Add size argument to pgtable_cache_add Aneesh Kumar K.V
2013-02-18 10:28 ` [RFC PATCH 06/17] powerpc/mm: Decode the pte-lp-encoding bits correctly Aneesh Kumar K.V
2013-02-18 10:28 ` [RFC PATCH 07/17] powerpc: Update tlbie/tlbiel as per ISA doc Aneesh Kumar K.V
2013-02-18 10:28 ` [RFC PATCH 08/17] powerpc: print both base and actual page size on hash failure Aneesh Kumar K.V
2013-02-18 10:28 ` Aneesh Kumar K.V [this message]
2013-02-18 10:28 ` [RFC PATCH 10/17] powerpc/mm: Fix hpte_decode to use the correct decoding for page sizes Aneesh Kumar K.V
2013-02-18 10:28 ` [RFC PATCH 11/17] powerpc: Print page size info during boot Aneesh Kumar K.V
2013-02-18 10:28 ` [RFC PATCH 12/17] powerpc/THP: Implement transparent huge pages for ppc64 Aneesh Kumar K.V
2013-02-18 10:28 ` [RFC PATCH 13/17] powerpc/THP: Add code to handle HPTE faults for large pages Aneesh Kumar K.V
2013-02-18 10:28 ` [RFC PATCH 14/17] powerpc: support for zerout withdraw Aneesh Kumar K.V
2013-02-18 10:28 ` [RFC PATCH 15/17] powerpc: hypervisor require few WIMG bit set Aneesh Kumar K.V
2013-02-18 10:28 ` [RFC PATCH 16/17] powerpc: get_user_pages_fast changes Aneesh Kumar K.V
2013-02-18 10:28 ` [RFC PATCH 17/17] powerpc: Save DAR and DSISR in pt_regs on MCE Aneesh Kumar K.V
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=1361183295-6958-10-git-send-email-aneesh.kumar@linux.vnet.ibm.com \
--to=aneesh.kumar@linux.vnet.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).