Message ID | 20140328091737.6cb02f7d@kryten (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
On Fri, 2014-03-28 at 09:17 +1100, Anton Blanchard wrote: > Byteswap struct opal_msg in one place instead of requiring all the > callers to do it. This will clash with us making opal.h something clean and identical between OPAL and clients. Can you rename the converted version instead ? (yeah I know, it suck to find a good name ...) Cheers, Ben. > Signed-off-by: Anton Blanchard <anton@samba.org> > --- > > Index: b/arch/powerpc/include/asm/opal.h > =================================================================== > --- a/arch/powerpc/include/asm/opal.h > +++ b/arch/powerpc/include/asm/opal.h > @@ -421,6 +421,12 @@ enum OpalSysparamPerm { > OPAL_SYSPARAM_RW = (OPAL_SYSPARAM_READ | OPAL_SYSPARAM_WRITE), > }; > > +struct raw_opal_msg { > + __be32 msg_type; > + __be32 reserved; > + __be64 params[8]; > +}; > + > struct opal_msg { > uint32_t msg_type; > uint32_t reserved; > Index: b/arch/powerpc/platforms/powernv/opal.c > =================================================================== > --- a/arch/powerpc/platforms/powernv/opal.c > +++ b/arch/powerpc/platforms/powernv/opal.c > @@ -288,9 +288,11 @@ static void opal_handle_message(void) > * TODO: pre-allocate a message buffer depending on opal-msg-size > * value in /proc/device-tree. > */ > + static struct raw_opal_msg raw_msg; > static struct opal_msg msg; > + int i; > > - ret = opal_get_msg(__pa(&msg), sizeof(msg)); > + ret = opal_get_msg(__pa(&raw_msg), sizeof(raw_msg)); > /* No opal message pending. */ > if (ret == OPAL_RESOURCE) > return; > @@ -302,6 +304,11 @@ static void opal_handle_message(void) > return; > } > > + msg.msg_type = be32_to_cpu(raw_msg.msg_type); > + msg.reserved = be32_to_cpu(raw_msg.reserved); > + for (i = 0; i < ARRAY_SIZE(raw_msg.params); i++) > + msg.params[i] = be64_to_cpu(raw_msg.params[i]); > + > /* Sanity check */ > if (msg.msg_type > OPAL_MSG_TYPE_MAX) { > pr_warning("%s: Unknown message type: %u\n",
Index: b/arch/powerpc/include/asm/opal.h =================================================================== --- a/arch/powerpc/include/asm/opal.h +++ b/arch/powerpc/include/asm/opal.h @@ -421,6 +421,12 @@ enum OpalSysparamPerm { OPAL_SYSPARAM_RW = (OPAL_SYSPARAM_READ | OPAL_SYSPARAM_WRITE), }; +struct raw_opal_msg { + __be32 msg_type; + __be32 reserved; + __be64 params[8]; +}; + struct opal_msg { uint32_t msg_type; uint32_t reserved; Index: b/arch/powerpc/platforms/powernv/opal.c =================================================================== --- a/arch/powerpc/platforms/powernv/opal.c +++ b/arch/powerpc/platforms/powernv/opal.c @@ -288,9 +288,11 @@ static void opal_handle_message(void) * TODO: pre-allocate a message buffer depending on opal-msg-size * value in /proc/device-tree. */ + static struct raw_opal_msg raw_msg; static struct opal_msg msg; + int i; - ret = opal_get_msg(__pa(&msg), sizeof(msg)); + ret = opal_get_msg(__pa(&raw_msg), sizeof(raw_msg)); /* No opal message pending. */ if (ret == OPAL_RESOURCE) return; @@ -302,6 +304,11 @@ static void opal_handle_message(void) return; } + msg.msg_type = be32_to_cpu(raw_msg.msg_type); + msg.reserved = be32_to_cpu(raw_msg.reserved); + for (i = 0; i < ARRAY_SIZE(raw_msg.params); i++) + msg.params[i] = be64_to_cpu(raw_msg.params[i]); + /* Sanity check */ if (msg.msg_type > OPAL_MSG_TYPE_MAX) { pr_warning("%s: Unknown message type: %u\n",
Byteswap struct opal_msg in one place instead of requiring all the callers to do it. Signed-off-by: Anton Blanchard <anton@samba.org> ---