Commit aa90ac45 authored by Sudeep Holla's avatar Sudeep Holla
Browse files

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: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
parent 2bc06ffa

drivers/firmware/arm_scmi/base.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/firmware/arm_scmi/clock.c

+4 −8
Original line number Diff line number Diff line
@@ -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;

drivers/firmware/arm_scmi/common.h

+2 −0
Original line number Diff line number Diff line
@@ -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)))

drivers/firmware/arm_scmi/perf.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

drivers/firmware/arm_scmi/power.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE