Commit bb4398e1 authored by Anton Blanchard's avatar Anton Blanchard Committed by Benjamin Herrenschmidt

powerpc/powernv: Fix endian issues with OPAL async code

OPAL defines opal_msg as a big endian struct so we have to
byte swap it on little endian builds.
Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 32b941b7
...@@ -422,9 +422,9 @@ enum OpalSysparamPerm { ...@@ -422,9 +422,9 @@ enum OpalSysparamPerm {
}; };
struct opal_msg { struct opal_msg {
uint32_t msg_type; __be32 msg_type;
uint32_t reserved; __be32 reserved;
uint64_t params[8]; __be64 params[8];
}; };
struct opal_machine_check_event { struct opal_machine_check_event {
......
...@@ -125,14 +125,15 @@ static int opal_async_comp_event(struct notifier_block *nb, ...@@ -125,14 +125,15 @@ static int opal_async_comp_event(struct notifier_block *nb,
{ {
struct opal_msg *comp_msg = msg; struct opal_msg *comp_msg = msg;
unsigned long flags; unsigned long flags;
uint64_t token;
if (msg_type != OPAL_MSG_ASYNC_COMP) if (msg_type != OPAL_MSG_ASYNC_COMP)
return 0; return 0;
memcpy(&opal_async_responses[comp_msg->params[0]], comp_msg, token = be64_to_cpu(comp_msg->params[0]);
sizeof(*comp_msg)); memcpy(&opal_async_responses[token], comp_msg, sizeof(*comp_msg));
spin_lock_irqsave(&opal_async_comp_lock, flags); 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); spin_unlock_irqrestore(&opal_async_comp_lock, flags);
wake_up(&opal_async_wait); wake_up(&opal_async_wait);
......
...@@ -53,7 +53,7 @@ int opal_get_sensor_data(u32 sensor_hndl, u32 *sensor_data) ...@@ -53,7 +53,7 @@ int opal_get_sensor_data(u32 sensor_hndl, u32 *sensor_data)
goto out_token; goto out_token;
} }
ret = msg.params[1]; ret = be64_to_cpu(msg.params[1]);
out_token: out_token:
mutex_unlock(&opal_sensor_mutex); mutex_unlock(&opal_sensor_mutex);
......
...@@ -64,7 +64,7 @@ static int opal_get_sys_param(u32 param_id, u32 length, void *buffer) ...@@ -64,7 +64,7 @@ static int opal_get_sys_param(u32 param_id, u32 length, void *buffer)
goto out_token; goto out_token;
} }
ret = msg.params[1]; ret = be64_to_cpu(msg.params[1]);
out_token: out_token:
opal_async_release_token(token); opal_async_release_token(token);
...@@ -98,7 +98,7 @@ static int opal_set_sys_param(u32 param_id, u32 length, void *buffer) ...@@ -98,7 +98,7 @@ static int opal_set_sys_param(u32 param_id, u32 length, void *buffer)
goto out_token; goto out_token;
} }
ret = msg.params[1]; ret = be64_to_cpu(msg.params[1]);
out_token: out_token:
opal_async_release_token(token); opal_async_release_token(token);
......
...@@ -281,6 +281,7 @@ static void opal_handle_message(void) ...@@ -281,6 +281,7 @@ static void opal_handle_message(void)
* value in /proc/device-tree. * value in /proc/device-tree.
*/ */
static struct opal_msg msg; static struct opal_msg msg;
u32 type;
ret = opal_get_msg(__pa(&msg), sizeof(msg)); ret = opal_get_msg(__pa(&msg), sizeof(msg));
/* No opal message pending. */ /* No opal message pending. */
...@@ -294,13 +295,14 @@ static void opal_handle_message(void) ...@@ -294,13 +295,14 @@ static void opal_handle_message(void)
return; return;
} }
type = be32_to_cpu(msg.msg_type);
/* Sanity check */ /* Sanity check */
if (msg.msg_type > OPAL_MSG_TYPE_MAX) { if (type > OPAL_MSG_TYPE_MAX) {
pr_warning("%s: Unknown message type: %u\n", pr_warning("%s: Unknown message type: %u\n", __func__, type);
__func__, msg.msg_type);
return; 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, static int opal_message_notify(struct notifier_block *nb,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment