redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

powerpc/powernv: Fix endian issues with OPAL async code

Browse source 
OPAL defines opal_msg as a big endian struct so we have to
byte swap it on little endian builds.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Anton Blanchard 2014-03-28 16:33:33 +11:00 committed by Benjamin Herrenschmidt
parent 32b941b793
commit bb4398e1de
5 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/powerpc/include/asm/opal.h
View file

@ -422,9 +422,9 @@ enum OpalSysparamPerm {
};
struct opal_msg {
uint32_t msg_type;
uint32_t reserved;
uint64_t params[8];
__be32 msg_type;
__be32 reserved;
__be64 params[8];
};
struct opal_machine_check_event {

7
arch/powerpc/platforms/powernv/opal-async.c
View file

@ -125,14 +125,15 @@ static int opal_async_comp_event(struct notifier_block *nb,
{
struct opal_msg *comp_msg = msg;
unsigned long flags;
uint64_t token;
if (msg_type != OPAL_MSG_ASYNC_COMP)
return 0;
memcpy(&opal_async_responses[comp_msg->params[0]], comp_msg,
sizeof(*comp_msg));
token = be64_to_cpu(comp_msg->params[0]);
memcpy(&opal_async_responses[token], comp_msg, sizeof(*comp_msg));
spin_lock_irqsave(&opal_async_comp_lock, flags);
__set_bit(comp_msg->params[0], opal_async_complete_map);
__set_bit(token, opal_async_complete_map);
spin_unlock_irqrestore(&opal_async_comp_lock, flags);
wake_up(&opal_async_wait);

2
arch/powerpc/platforms/powernv/opal-sensor.c
View file

@ -53,7 +53,7 @@ int opal_get_sensor_data(u32 sensor_hndl, u32 *sensor_data)
goto out_token;
}
ret = msg.params[1];
ret = be64_to_cpu(msg.params[1]);
out_token:
mutex_unlock(&opal_sensor_mutex);

4
arch/powerpc/platforms/powernv/opal-sysparam.c
View file

@ -64,7 +64,7 @@ static int opal_get_sys_param(u32 param_id, u32 length, void *buffer)
goto out_token;
}
ret = msg.params[1];
ret = be64_to_cpu(msg.params[1]);
out_token:
opal_async_release_token(token);
@ -98,7 +98,7 @@ static int opal_set_sys_param(u32 param_id, u32 length, void *buffer)
goto out_token;
}
ret = msg.params[1];
ret = be64_to_cpu(msg.params[1]);
out_token:
opal_async_release_token(token);

10
arch/powerpc/platforms/powernv/opal.c
View file

@ -281,6 +281,7 @@ static void opal_handle_message(void)
* value in /proc/device-tree.
*/
static struct opal_msg msg;
u32 type;
ret = opal_get_msg(__pa(&msg), sizeof(msg));
/* No opal message pending. */
@ -294,13 +295,14 @@ static void opal_handle_message(void)
return;
}
type = be32_to_cpu(msg.msg_type);
/* Sanity check */
if (msg.msg_type > OPAL_MSG_TYPE_MAX) {
pr_warning("%s: Unknown message type: %u\n",
__func__, msg.msg_type);
if (type > OPAL_MSG_TYPE_MAX) {
pr_warning("%s: Unknown message type: %u\n", __func__, type);
return;
}
opal_message_do_notify(msg.msg_type, (void *)&msg);
opal_message_do_notify(type, (void *)&msg);
}
static int opal_message_notify(struct notifier_block *nb,