Commit b7bd36f2 authored by Cristian Marussi's avatar Cristian Marussi Committed by Sudeep Holla
Browse files

firmware: arm_scmi: Add atomic support to clock protocol 

Introduce new _atomic variant for SCMI clock protocol operations related
to enable disable operations: when an atomic operation is required the xfer
poll_completion flag is set for that transaction.

Link: https://lore.kernel.org/r/20220217131234.50328-7-cristian.marussi@arm.com


Signed-off-by: default avatarCristian Marussi <cristian.marussi@arm.com>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
parent 05976c5f

drivers/firmware/arm_scmi/clock.c

+19 −3
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ static int scmi_clock_rate_set(const struct scmi_protocol_handle *ph, 


static int

scmi_clock_config_set(const struct scmi_protocol_handle *ph, u32 clk_id,

		      u32 config)

		      u32 config, bool atomic)

{

	int ret;

	struct scmi_xfer *t;
@@ -284,6 +284,8 @@ scmi_clock_config_set(const struct scmi_protocol_handle *ph, u32 clk_id, 
	if (ret)

		return ret;



	t->hdr.poll_completion = atomic;



	cfg = t->tx.buf;

	cfg->id = cpu_to_le32(clk_id);

	cfg->attributes = cpu_to_le32(config);
@@ -296,12 +298,24 @@ scmi_clock_config_set(const struct scmi_protocol_handle *ph, u32 clk_id, 


static int scmi_clock_enable(const struct scmi_protocol_handle *ph, u32 clk_id)

{

	return scmi_clock_config_set(ph, clk_id, CLOCK_ENABLE);

	return scmi_clock_config_set(ph, clk_id, CLOCK_ENABLE, false);

}



static int scmi_clock_disable(const struct scmi_protocol_handle *ph, u32 clk_id)

{

	return scmi_clock_config_set(ph, clk_id, 0);

	return scmi_clock_config_set(ph, clk_id, 0, false);

}



static int scmi_clock_enable_atomic(const struct scmi_protocol_handle *ph,

				    u32 clk_id)

{

	return scmi_clock_config_set(ph, clk_id, CLOCK_ENABLE, true);

}



static int scmi_clock_disable_atomic(const struct scmi_protocol_handle *ph,

				     u32 clk_id)

{

	return scmi_clock_config_set(ph, clk_id, 0, true);

}



static int scmi_clock_count_get(const struct scmi_protocol_handle *ph)
@@ -330,6 +344,8 @@ static const struct scmi_clk_proto_ops clk_proto_ops = { 
	.rate_set = scmi_clock_rate_set,

	.enable = scmi_clock_enable,

	.disable = scmi_clock_disable,

	.enable_atomic = scmi_clock_enable_atomic,

	.disable_atomic = scmi_clock_disable_atomic,

};



static int scmi_clock_protocol_init(const struct scmi_protocol_handle *ph)

include/linux/scmi_protocol.h

+3 −0
Original line number Diff line number Diff line
@@ -82,6 +82,9 @@ struct scmi_clk_proto_ops { 
			u64 rate);

	int (*enable)(const struct scmi_protocol_handle *ph, u32 clk_id);

	int (*disable)(const struct scmi_protocol_handle *ph, u32 clk_id);

	int (*enable_atomic)(const struct scmi_protocol_handle *ph, u32 clk_id);

	int (*disable_atomic)(const struct scmi_protocol_handle *ph,

			      u32 clk_id);

};



/**