firmware: arm_scmi: Use {get,put}_unaligned_le{32,64} accessors

Instead of type-casting the {tx,rx}.buf all over the place while
accessing them to read/write __le{32,64} from/to the firmware, let's
use the existing {get,put}_unaligned_le{32,64} accessors to hide all
the type cast ugliness.

Suggested-by: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

diff --git a/drivers/firmware/arm_scmi/base.c b/drivers/firmware/arm_scmi/base.c
index 204390297f4bd4e249a6f3987e992ff1eb2b7d56..f804e8af6521b9808a833830368776abddc81305 100644 (file)
--- a/drivers/firmware/arm_scmi/base.c
+++ b/drivers/firmware/arm_scmi/base.c
@@ -204,7 +204,7 @@ static int scmi_base_discover_agent_get(const struct scmi_handle *handle,
        if (ret)
                return ret;
 
-       *(__le32 *)t->tx.buf = cpu_to_le32(id);
+       put_unaligned_le32(id, t->tx.buf);
 
        ret = scmi_do_xfer(handle, t);
        if (!ret)

diff --git a/drivers/firmware/arm_scmi/clock.c b/drivers/firmware/arm_scmi/clock.c
index 4a32ae1822a37c13a338b58343d37480d2501593..32526a793f3ace11cb5835cf336aea22aae53325 100644 (file)
--- a/drivers/firmware/arm_scmi/clock.c
+++ b/drivers/firmware/arm_scmi/clock.c
@@ -107,7 +107,7 @@ static int scmi_clock_attributes_get(const struct scmi_handle *handle,
        if (ret)
                return ret;
 
-       *(__le32 *)t->tx.buf = cpu_to_le32(clk_id);
+       put_unaligned_le32(clk_id, t->tx.buf);
        attr = t->rx.buf;
 
        ret = scmi_do_xfer(handle, t);
@@ -204,15 +204,11 @@ scmi_clock_rate_get(const struct scmi_handle *handle, u32 clk_id, u64 *value)
        if (ret)
                return ret;
 
-       *(__le32 *)t->tx.buf = cpu_to_le32(clk_id);
+       put_unaligned_le32(clk_id, t->tx.buf);
 
        ret = scmi_do_xfer(handle, t);
-       if (!ret) {
-               __le32 *pval = t->rx.buf;
-
-               *value = le32_to_cpu(*pval);
-               *value |= (u64)le32_to_cpu(*(pval + 1)) << 32;
-       }
+       if (!ret)
+               *value = get_unaligned_le64(t->rx.buf);
 
        scmi_xfer_put(handle, t);
        return ret;

diff --git a/drivers/firmware/arm_scmi/common.h b/drivers/firmware/arm_scmi/common.h
index 43884e4ceac5cf2afba8a6a6f40c0bb95a40a5d4..5237c2ff79fea1dfce305a20542b3d3b9f17d5b6 100644 (file)
--- a/drivers/firmware/arm_scmi/common.h
+++ b/drivers/firmware/arm_scmi/common.h
@@ -15,6 +15,8 @@
 #include <linux/scmi_protocol.h>
 #include <linux/types.h>
 
+#include <asm/unaligned.h>
+
 #define PROTOCOL_REV_MINOR_MASK        GENMASK(15, 0)
 #define PROTOCOL_REV_MAJOR_MASK        GENMASK(31, 16)
 #define PROTOCOL_REV_MAJOR(x)  (u16)(FIELD_GET(PROTOCOL_REV_MAJOR_MASK, (x)))

diff --git a/drivers/firmware/arm_scmi/perf.c b/drivers/firmware/arm_scmi/perf.c
index 3c8ae7cc35de3cf1b10cb452adbd8f0282b39a27..95b87cd44f94a58905408cedb27239a6599932b6 100644 (file)
--- a/drivers/firmware/arm_scmi/perf.c
+++ b/drivers/firmware/arm_scmi/perf.c
@@ -151,7 +151,7 @@ scmi_perf_domain_attributes_get(const struct scmi_handle *handle, u32 domain,
        if (ret)
                return ret;
 
-       *(__le32 *)t->tx.buf = cpu_to_le32(domain);
+       put_unaligned_le32(domain, t->tx.buf);
        attr = t->rx.buf;
 
        ret = scmi_do_xfer(handle, t);
@@ -284,7 +284,7 @@ static int scmi_perf_limits_get(const struct scmi_handle *handle, u32 domain,
        if (ret)
                return ret;
 
-       *(__le32 *)t->tx.buf = cpu_to_le32(domain);
+       put_unaligned_le32(domain, t->tx.buf);
 
        ret = scmi_do_xfer(handle, t);
        if (!ret) {
@@ -333,11 +333,11 @@ static int scmi_perf_level_get(const struct scmi_handle *handle, u32 domain,
                return ret;
 
        t->hdr.poll_completion = poll;
-       *(__le32 *)t->tx.buf = cpu_to_le32(domain);
+       put_unaligned_le32(domain, t->tx.buf);
 
        ret = scmi_do_xfer(handle, t);
        if (!ret)
-               *level = le32_to_cpu(*(__le32 *)t->rx.buf);
+               *level = get_unaligned_le32(t->rx.buf);
 
        scmi_xfer_put(handle, t);
        return ret;

diff --git a/drivers/firmware/arm_scmi/power.c b/drivers/firmware/arm_scmi/power.c
index 62f3401a1f01e90d9ddceabbe462416471d67614..5abef7079c0a31a84e7290209ff01f4bf0559e99 100644 (file)
--- a/drivers/firmware/arm_scmi/power.c
+++ b/drivers/firmware/arm_scmi/power.c
@@ -96,7 +96,7 @@ scmi_power_domain_attributes_get(const struct scmi_handle *handle, u32 domain,
        if (ret)
                return ret;
 
-       *(__le32 *)t->tx.buf = cpu_to_le32(domain);
+       put_unaligned_le32(domain, t->tx.buf);
        attr = t->rx.buf;
 
        ret = scmi_do_xfer(handle, t);
@@ -147,11 +147,11 @@ scmi_power_state_get(const struct scmi_handle *handle, u32 domain, u32 *state)
        if (ret)
                return ret;
 
-       *(__le32 *)t->tx.buf = cpu_to_le32(domain);
+       put_unaligned_le32(domain, t->tx.buf);
 
        ret = scmi_do_xfer(handle, t);
        if (!ret)
-               *state = le32_to_cpu(*(__le32 *)t->rx.buf);
+               *state = get_unaligned_le32(t->rx.buf);
 
        scmi_xfer_put(handle, t);
        return ret;

diff --git a/drivers/firmware/arm_scmi/sensors.c b/drivers/firmware/arm_scmi/sensors.c
index 7570308a16a07c34acc5681e362cd8786c9368cb..a400ea805fc236738047efc3dc351cfa79aed895 100644 (file)
--- a/drivers/firmware/arm_scmi/sensors.c
+++ b/drivers/firmware/arm_scmi/sensors.c
@@ -120,7 +120,7 @@ static int scmi_sensor_description_get(const struct scmi_handle *handle,
 
        do {
                /* Set the number of sensors to be skipped/already read */
-               *(__le32 *)t->tx.buf = cpu_to_le32(desc_index);
+               put_unaligned_le32(desc_index, t->tx.buf);
 
                ret = scmi_do_xfer(handle, t);
                if (ret)
@@ -217,7 +217,6 @@ static int scmi_sensor_reading_get(const struct scmi_handle *handle,
                                   u32 sensor_id, u64 *value)
 {
        int ret;
-       __le32 *pval;
        struct scmi_xfer *t;
        struct scmi_msg_sensor_reading_get *sensor;
        struct sensors_info *si = handle->sensor_priv;
@@ -229,24 +228,20 @@ static int scmi_sensor_reading_get(const struct scmi_handle *handle,
        if (ret)
                return ret;
 
-       pval = t->rx.buf;
        sensor = t->tx.buf;
        sensor->id = cpu_to_le32(sensor_id);
 
        if (s->async) {
                sensor->flags = cpu_to_le32(SENSOR_READ_ASYNC);
                ret = scmi_do_xfer_with_response(handle, t);
-               if (!ret) {
-                       *value = le32_to_cpu(*(pval + 1));
-                       *value |= (u64)le32_to_cpu(*(pval + 2)) << 32;
-               }
+               if (!ret)
+                       *value = get_unaligned_le64((void *)
+                                                   ((__le32 *)t->rx.buf + 1));
        } else {
                sensor->flags = cpu_to_le32(0);
                ret = scmi_do_xfer(handle, t);
-               if (!ret) {
-                       *value = le32_to_cpu(*pval);
-                       *value |= (u64)le32_to_cpu(*(pval + 1)) << 32;
-               }
+               if (!ret)
+                       *value = get_unaligned_le64(t->rx.buf);
        }
 
        scmi_xfer_put(handle, t);