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

firmware: arm_scmi: Add SCMI v3.1 protocol extended names support 

Using the common protocol helper implementation add support for all new
SCMIv3.1 extended names commands related to all protocols with the
exception of SENSOR_AXIS_GET_NAME.

Link: https://lore.kernel.org/r/20220330150551.2573938-12-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 5c873d12

drivers/firmware/arm_scmi/clock.c

+18 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ enum scmi_clock_protocol_cmd { 
	CLOCK_RATE_SET = 0x5,

	CLOCK_RATE_GET = 0x6,

	CLOCK_CONFIG_SET = 0x7,

	CLOCK_NAME_GET = 0x8,

};



struct scmi_msg_resp_clock_protocol_attributes {
@@ -27,7 +28,8 @@ struct scmi_msg_resp_clock_protocol_attributes { 
struct scmi_msg_resp_clock_attributes {

	__le32 attributes;

#define	CLOCK_ENABLE	BIT(0)

	u8 name[SCMI_MAX_STR_SIZE];

#define SUPPORTS_EXTENDED_NAMES(x)	((x) & BIT(29))

	u8 name[SCMI_SHORT_NAME_MAX_SIZE];

	__le32 clock_enable_latency;

};
@@ -108,9 +110,11 @@ scmi_clock_protocol_attributes_get(const struct scmi_protocol_handle *ph, 
}



static int scmi_clock_attributes_get(const struct scmi_protocol_handle *ph,

				     u32 clk_id, struct scmi_clock_info *clk)

				     u32 clk_id, struct scmi_clock_info *clk,

				     u32 version)

{

	int ret;

	u32 attributes;

	struct scmi_xfer *t;

	struct scmi_msg_resp_clock_attributes *attr;
@@ -124,6 +128,7 @@ static int scmi_clock_attributes_get(const struct scmi_protocol_handle *ph, 


	ret = ph->xops->do_xfer(ph, t);

	if (!ret) {

		attributes = le32_to_cpu(attr->attributes);

		strlcpy(clk->name, attr->name, SCMI_MAX_STR_SIZE);

		/* Is optional field clock_enable_latency provided ? */

		if (t->rx.len == sizeof(*attr))
@@ -132,6 +137,16 @@ static int scmi_clock_attributes_get(const struct scmi_protocol_handle *ph, 
	}



	ph->xops->xfer_put(ph, t);



	/*

	 * If supported overwrite short name with the extended one;

	 * on error just carry on and use already provided short name.

	 */

	if (!ret && PROTOCOL_REV_MAJOR(version) >= 0x2 &&

	    SUPPORTS_EXTENDED_NAMES(attributes))

		ph->hops->extended_name_get(ph, CLOCK_NAME_GET, clk_id,

					    clk->name, SCMI_MAX_STR_SIZE);



	return ret;

}
@@ -400,7 +415,7 @@ static int scmi_clock_protocol_init(const struct scmi_protocol_handle *ph) 
	for (clkid = 0; clkid < cinfo->num_clocks; clkid++) {

		struct scmi_clock_info *clk = cinfo->clk + clkid;



		ret = scmi_clock_attributes_get(ph, clkid, clk);

		ret = scmi_clock_attributes_get(ph, clkid, clk, version);

		if (!ret)

			scmi_clock_describe_rates_get(ph, clkid, clk);

	}

drivers/firmware/arm_scmi/perf.c

+18 −4
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ enum scmi_performance_protocol_cmd { 
	PERF_NOTIFY_LIMITS = 0x9,

	PERF_NOTIFY_LEVEL = 0xa,

	PERF_DESCRIBE_FASTCHANNEL = 0xb,

	PERF_DOMAIN_NAME_GET = 0xc,

};



struct scmi_opp {
@@ -56,10 +57,11 @@ struct scmi_msg_resp_perf_domain_attributes { 
#define SUPPORTS_PERF_LIMIT_NOTIFY(x)	((x) & BIT(29))

#define SUPPORTS_PERF_LEVEL_NOTIFY(x)	((x) & BIT(28))

#define SUPPORTS_PERF_FASTCHANNELS(x)	((x) & BIT(27))

#define SUPPORTS_EXTENDED_NAMES(x)	((x) & BIT(26))

	__le32 rate_limit_us;

	__le32 sustained_freq_khz;

	__le32 sustained_perf_level;

	    u8 name[SCMI_MAX_STR_SIZE];

	    u8 name[SCMI_SHORT_NAME_MAX_SIZE];

};



struct scmi_msg_perf_describe_levels {
@@ -209,9 +211,11 @@ static int scmi_perf_attributes_get(const struct scmi_protocol_handle *ph, 


static int

scmi_perf_domain_attributes_get(const struct scmi_protocol_handle *ph,

				u32 domain, struct perf_dom_info *dom_info)

				u32 domain, struct perf_dom_info *dom_info,

				u32 version)

{

	int ret;

	u32 flags;

	struct scmi_xfer *t;

	struct scmi_msg_resp_perf_domain_attributes *attr;
@@ -225,7 +229,7 @@ scmi_perf_domain_attributes_get(const struct scmi_protocol_handle *ph, 


	ret = ph->xops->do_xfer(ph, t);

	if (!ret) {

		u32 flags = le32_to_cpu(attr->flags);

		flags = le32_to_cpu(attr->flags);



		dom_info->set_limits = SUPPORTS_SET_LIMITS(flags);

		dom_info->set_perf = SUPPORTS_SET_PERF_LVL(flags);
@@ -248,6 +252,16 @@ scmi_perf_domain_attributes_get(const struct scmi_protocol_handle *ph, 
	}



	ph->xops->xfer_put(ph, t);



	/*

	 * If supported overwrite short name with the extended one;

	 * on error just carry on and use already provided short name.

	 */

	if (!ret && PROTOCOL_REV_MAJOR(version) >= 0x3 &&

	    SUPPORTS_EXTENDED_NAMES(flags))

		ph->hops->extended_name_get(ph, PERF_DOMAIN_NAME_GET, domain,

					    dom_info->name, SCMI_MAX_STR_SIZE);



	return ret;

}
@@ -902,7 +916,7 @@ static int scmi_perf_protocol_init(const struct scmi_protocol_handle *ph) 
	for (domain = 0; domain < pinfo->num_domains; domain++) {

		struct perf_dom_info *dom = pinfo->dom_info + domain;



		scmi_perf_domain_attributes_get(ph, domain, dom);

		scmi_perf_domain_attributes_get(ph, domain, dom, version);

		scmi_perf_describe_levels_get(ph, domain, dom);



		if (dom->perf_fastchannels)

drivers/firmware/arm_scmi/power.c

+20 −5
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ enum scmi_power_protocol_cmd { 
	POWER_STATE_SET = 0x4,

	POWER_STATE_GET = 0x5,

	POWER_STATE_NOTIFY = 0x6,

	POWER_DOMAIN_NAME_GET = 0x8,

};



struct scmi_msg_resp_power_attributes {
@@ -33,7 +34,8 @@ struct scmi_msg_resp_power_domain_attributes { 
#define SUPPORTS_STATE_SET_NOTIFY(x)	((x) & BIT(31))

#define SUPPORTS_STATE_SET_ASYNC(x)	((x) & BIT(30))

#define SUPPORTS_STATE_SET_SYNC(x)	((x) & BIT(29))

	    u8 name[SCMI_MAX_STR_SIZE];

#define SUPPORTS_EXTENDED_NAMES(x)	((x) & BIT(27))

	    u8 name[SCMI_SHORT_NAME_MAX_SIZE];

};



struct scmi_power_set_state {
@@ -97,9 +99,11 @@ static int scmi_power_attributes_get(const struct scmi_protocol_handle *ph, 


static int

scmi_power_domain_attributes_get(const struct scmi_protocol_handle *ph,

				 u32 domain, struct power_dom_info *dom_info)

				 u32 domain, struct power_dom_info *dom_info,

				 u32 version)

{

	int ret;

	u32 flags;

	struct scmi_xfer *t;

	struct scmi_msg_resp_power_domain_attributes *attr;
@@ -113,15 +117,26 @@ scmi_power_domain_attributes_get(const struct scmi_protocol_handle *ph, 


	ret = ph->xops->do_xfer(ph, t);

	if (!ret) {

		u32 flags = le32_to_cpu(attr->flags);

		flags = le32_to_cpu(attr->flags);



		dom_info->state_set_notify = SUPPORTS_STATE_SET_NOTIFY(flags);

		dom_info->state_set_async = SUPPORTS_STATE_SET_ASYNC(flags);

		dom_info->state_set_sync = SUPPORTS_STATE_SET_SYNC(flags);

		strlcpy(dom_info->name, attr->name, SCMI_MAX_STR_SIZE);

	}



	ph->xops->xfer_put(ph, t);



	/*

	 * If supported overwrite short name with the extended one;

	 * on error just carry on and use already provided short name.

	 */

	if (!ret && PROTOCOL_REV_MAJOR(version) >= 0x3 &&

	    SUPPORTS_EXTENDED_NAMES(flags)) {

		ph->hops->extended_name_get(ph, POWER_DOMAIN_NAME_GET,

					    domain, dom_info->name,

					    SCMI_MAX_STR_SIZE);

	}



	return ret;

}
@@ -308,7 +323,7 @@ static int scmi_power_protocol_init(const struct scmi_protocol_handle *ph) 
	for (domain = 0; domain < pinfo->num_domains; domain++) {

		struct power_dom_info *dom = pinfo->dom_info + domain;



		scmi_power_domain_attributes_get(ph, domain, dom);

		scmi_power_domain_attributes_get(ph, domain, dom, version);

	}



	pinfo->version = version;

drivers/firmware/arm_scmi/protocols.h

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 


#include <asm/unaligned.h>



#define SCMI_SHORT_NAME_MAX_SIZE	16



#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/reset.c

+18 −4
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ enum scmi_reset_protocol_cmd { 
	RESET_DOMAIN_ATTRIBUTES = 0x3,

	RESET = 0x4,

	RESET_NOTIFY = 0x5,

	RESET_DOMAIN_NAME_GET = 0x6,

};



#define NUM_RESET_DOMAIN_MASK	0xffff
@@ -26,8 +27,9 @@ struct scmi_msg_resp_reset_domain_attributes { 
	__le32 attributes;

#define SUPPORTS_ASYNC_RESET(x)		((x) & BIT(31))

#define SUPPORTS_NOTIFY_RESET(x)	((x) & BIT(30))

#define SUPPORTS_EXTENDED_NAMES(x)	((x) & BIT(29))

	__le32 latency;

	    u8 name[SCMI_MAX_STR_SIZE];

	u8 name[SCMI_SHORT_NAME_MAX_SIZE];

};



struct scmi_msg_reset_domain_reset {
@@ -89,9 +91,11 @@ static int scmi_reset_attributes_get(const struct scmi_protocol_handle *ph, 


static int

scmi_reset_domain_attributes_get(const struct scmi_protocol_handle *ph,

				 u32 domain, struct reset_dom_info *dom_info)

				 u32 domain, struct reset_dom_info *dom_info,

				 u32 version)

{

	int ret;

	u32 attributes;

	struct scmi_xfer *t;

	struct scmi_msg_resp_reset_domain_attributes *attr;
@@ -105,7 +109,7 @@ scmi_reset_domain_attributes_get(const struct scmi_protocol_handle *ph, 


	ret = ph->xops->do_xfer(ph, t);

	if (!ret) {

		u32 attributes = le32_to_cpu(attr->attributes);

		attributes = le32_to_cpu(attr->attributes);



		dom_info->async_reset = SUPPORTS_ASYNC_RESET(attributes);

		dom_info->reset_notify = SUPPORTS_NOTIFY_RESET(attributes);
@@ -116,6 +120,16 @@ scmi_reset_domain_attributes_get(const struct scmi_protocol_handle *ph, 
	}



	ph->xops->xfer_put(ph, t);



	/*

	 * If supported overwrite short name with the extended one;

	 * on error just carry on and use already provided short name.

	 */

	if (!ret && PROTOCOL_REV_MAJOR(version) >= 0x3 &&

	    SUPPORTS_EXTENDED_NAMES(attributes))

		ph->hops->extended_name_get(ph, RESET_DOMAIN_NAME_GET, domain,

					    dom_info->name, SCMI_MAX_STR_SIZE);



	return ret;

}
@@ -320,7 +334,7 @@ static int scmi_reset_protocol_init(const struct scmi_protocol_handle *ph) 
	for (domain = 0; domain < pinfo->num_domains; domain++) {

		struct reset_dom_info *dom = pinfo->dom_info + domain;



		scmi_reset_domain_attributes_get(ph, domain, dom);

		scmi_reset_domain_attributes_get(ph, domain, dom, version);

	}



	pinfo->version = version;