From: Greg Kurz <gkurz@linux•vnet.ibm.com>
To: Michael Ellerman <mpe@ellerman•id.au>
Cc: linuxppc-dev@lists•ozlabs.org
Subject: [PATCH v3 2/5] powerpc/vphn: move endianness fixing to vphn_unpack_associativity()
Date: Mon, 23 Feb 2015 16:14:25 +0100 [thread overview]
Message-ID: <20150223151425.21565.49048.stgit@bahia.local> (raw)
In-Reply-To: <20150223151412.21565.2251.stgit@bahia.local>
The first argument to vphn_unpack_associativity() is a const long *, but the
parsing code expects __be64 values actually. Let's move the endian fixing
down for consistency.
Signed-off-by: Greg Kurz <gkurz@linux•vnet.ibm.com>
---
arch/powerpc/mm/numa.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 7a5bc21..59196c5 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -1263,13 +1263,18 @@ static int update_cpu_associativity_changes_mask(void)
*/
static int vphn_unpack_associativity(const long *packed, __be32 *unpacked)
{
+ __be64 be_packed[VPHN_REGISTER_COUNT];
int i, nr_assoc_doms = 0;
- const __be16 *field = (const __be16 *) packed;
+ const __be16 *field = (const __be16 *) be_packed;
#define VPHN_FIELD_UNUSED (0xffff)
#define VPHN_FIELD_MSB (0x8000)
#define VPHN_FIELD_MASK (~VPHN_FIELD_MSB)
+ /* Let's recreate the original stream. */
+ for (i = 0; i < VPHN_REGISTER_COUNT; i++)
+ be_packed[i] = cpu_to_be64(packed[i]);
+
for (i = 1; i < VPHN_ASSOC_BUFSIZE; i++) {
if (be16_to_cpup(field) == VPHN_FIELD_UNUSED) {
/* All significant fields processed, and remaining
@@ -1310,11 +1315,8 @@ static long hcall_vphn(unsigned long cpu, __be32 *associativity)
long retbuf[PLPAR_HCALL9_BUFSIZE] = {0};
u64 flags = 1;
int hwcpu = get_hard_smp_processor_id(cpu);
- int i;
rc = plpar_hcall9(H_HOME_NODE_ASSOCIATIVITY, retbuf, flags, hwcpu);
- for (i = 0; i < VPHN_REGISTER_COUNT; i++)
- retbuf[i] = cpu_to_be64(retbuf[i]);
vphn_unpack_associativity(retbuf, associativity);
return rc;
next prev parent reply other threads:[~2015-02-23 15:14 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-23 15:14 [PATCH v3 0/5] VPHN parsing fixes Greg Kurz
2015-02-23 15:14 ` [PATCH v3 1/5] powerpc/vphn: clarify the H_HOME_NODE_ASSOCIATIVITY API Greg Kurz
2015-02-23 15:14 ` Greg Kurz [this message]
2015-02-23 15:14 ` [PATCH v3 3/5] powerpc/vphn: move VPHN parsing logic to a separate file Greg Kurz
2015-02-23 15:14 ` [PATCH v3 4/5] powerpc/vphn: parsing code rewrite Greg Kurz
2015-03-17 9:50 ` Anshuman Khandual
2015-03-17 10:48 ` Greg Kurz
2015-02-23 15:14 ` [PATCH v3 5/5] selftests, powerpc: Add test for VPHN Greg Kurz
2015-03-17 4:21 ` [PATCH v4 5/5] selftests/powerpc: " Michael Ellerman
2015-03-17 11:49 ` Greg Kurz
2015-03-17 22:58 ` Michael Ellerman
2015-03-17 11:11 ` [PATCH v3 0/5] VPHN parsing fixes Anshuman Khandual
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=20150223151425.21565.49048.stgit@bahia.local \
--to=gkurz@linux$(echo .)vnet.ibm.com \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mpe@ellerman$(echo .)id.au \
/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