Re: [PATCH] firmware: arm_scmi: Add optional flags to extended names helper

[Cristian Marussi <cristian.marussi@arm.com>]

On Thu, Nov 02, 2023 at 07:19:45AM +0000, Cristian Marussi wrote:
> Some recently added SCMI protocols needs an additional flags parameter to
> be able to properly configure the command used to query the extended name
> of a resource.
> 

Hi Oleksii,

I posted this independently from your series:

https://lore.kernel.org/lkml/20231114145449.3136412-1-cristian.marussi@arm.com

(and forgot to CC you :< ...)

Thanks,
Cristian

> Signed-off-by: Cristian Marussi <cristian.marussi@arm.com>
> ---
>  drivers/firmware/arm_scmi/clock.c     |  2 +-
>  drivers/firmware/arm_scmi/driver.c    | 12 ++++++++----
>  drivers/firmware/arm_scmi/perf.c      |  2 +-
>  drivers/firmware/arm_scmi/power.c     |  2 +-
>  drivers/firmware/arm_scmi/powercap.c  |  2 +-
>  drivers/firmware/arm_scmi/protocols.h |  3 ++-
>  drivers/firmware/arm_scmi/reset.c     |  3 ++-
>  drivers/firmware/arm_scmi/sensors.c   |  2 +-
>  drivers/firmware/arm_scmi/voltage.c   |  2 +-
>  9 files changed, 18 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/firmware/arm_scmi/clock.c b/drivers/firmware/arm_scmi/clock.c
> index 96060bf90a24..e6e087686e8c 100644
> --- a/drivers/firmware/arm_scmi/clock.c
> +++ b/drivers/firmware/arm_scmi/clock.c
> @@ -169,7 +169,7 @@ static int scmi_clock_attributes_get(const struct scmi_protocol_handle *ph,
>  	if (!ret && PROTOCOL_REV_MAJOR(version) >= 0x2) {
>  		if (SUPPORTS_EXTENDED_NAMES(attributes))
>  			ph->hops->extended_name_get(ph, CLOCK_NAME_GET, clk_id,
> -						    clk->name,
> +						    NULL, clk->name,
>  						    SCMI_MAX_STR_SIZE);
>  
>  		if (SUPPORTS_RATE_CHANGED_NOTIF(attributes))
> diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
> index 87383c05424b..7c7545dea8c6 100644
> --- a/drivers/firmware/arm_scmi/driver.c
> +++ b/drivers/firmware/arm_scmi/driver.c
> @@ -1438,6 +1438,7 @@ struct scmi_msg_resp_domain_name_get {
>   * @ph: A protocol handle reference.
>   * @cmd_id: The specific command ID to use.
>   * @res_id: The specific resource ID to use.
> + * @flags: A pointer to specific flags to use, if any.
>   * @name: A pointer to the preallocated area where the retrieved name will be
>   *	  stored as a NULL terminated string.
>   * @len: The len in bytes of the @name char array.
> @@ -1445,19 +1446,22 @@ struct scmi_msg_resp_domain_name_get {
>   * Return: 0 on Succcess
>   */
>  static int scmi_common_extended_name_get(const struct scmi_protocol_handle *ph,
> -					 u8 cmd_id, u32 res_id, char *name,
> -					 size_t len)
> +					 u8 cmd_id, u32 res_id, u32 *flags,
> +					 char *name, size_t len)
>  {
>  	int ret;
> +	size_t txlen;
>  	struct scmi_xfer *t;
>  	struct scmi_msg_resp_domain_name_get *resp;
>  
> -	ret = ph->xops->xfer_get_init(ph, cmd_id, sizeof(res_id),
> -				      sizeof(*resp), &t);
> +	txlen = !flags ? sizeof(res_id) : sizeof(res_id) + sizeof(*flags);
> +	ret = ph->xops->xfer_get_init(ph, cmd_id, txlen, sizeof(*resp), &t);
>  	if (ret)
>  		goto out;
>  
>  	put_unaligned_le32(res_id, t->tx.buf);
> +	if (flags)
> +		put_unaligned_le32(*flags, t->tx.buf + sizeof(res_id));
>  	resp = t->rx.buf;
>  
>  	ret = ph->xops->do_xfer(ph, t);
> diff --git a/drivers/firmware/arm_scmi/perf.c b/drivers/firmware/arm_scmi/perf.c
> index c0cd556fbaae..0902b32dcecd 100644
> --- a/drivers/firmware/arm_scmi/perf.c
> +++ b/drivers/firmware/arm_scmi/perf.c
> @@ -288,7 +288,7 @@ scmi_perf_domain_attributes_get(const struct scmi_protocol_handle *ph,
>  	if (!ret && PROTOCOL_REV_MAJOR(version) >= 0x3 &&
>  	    SUPPORTS_EXTENDED_NAMES(flags))
>  		ph->hops->extended_name_get(ph, PERF_DOMAIN_NAME_GET,
> -					    dom_info->id, dom_info->name,
> +					    dom_info->id, NULL, dom_info->name,
>  					    SCMI_MAX_STR_SIZE);
>  
>  	if (dom_info->level_indexing_mode) {
> diff --git a/drivers/firmware/arm_scmi/power.c b/drivers/firmware/arm_scmi/power.c
> index 356e83631664..077767d6e902 100644
> --- a/drivers/firmware/arm_scmi/power.c
> +++ b/drivers/firmware/arm_scmi/power.c
> @@ -133,7 +133,7 @@ scmi_power_domain_attributes_get(const struct scmi_protocol_handle *ph,
>  	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,
> +					    domain, NULL, dom_info->name,
>  					    SCMI_MAX_STR_SIZE);
>  	}
>  
> diff --git a/drivers/firmware/arm_scmi/powercap.c b/drivers/firmware/arm_scmi/powercap.c
> index 244929cb4f3e..86c9a0b5a765 100644
> --- a/drivers/firmware/arm_scmi/powercap.c
> +++ b/drivers/firmware/arm_scmi/powercap.c
> @@ -270,7 +270,7 @@ scmi_powercap_domain_attributes_get(const struct scmi_protocol_handle *ph,
>  	 */
>  	if (!ret && SUPPORTS_EXTENDED_NAMES(flags))
>  		ph->hops->extended_name_get(ph, POWERCAP_DOMAIN_NAME_GET,
> -					    domain, dom_info->name,
> +					    domain, NULL, dom_info->name,
>  					    SCMI_MAX_STR_SIZE);
>  
>  	return ret;
> diff --git a/drivers/firmware/arm_scmi/protocols.h b/drivers/firmware/arm_scmi/protocols.h
> index 78e1a01eb656..b3c6314bb4b8 100644
> --- a/drivers/firmware/arm_scmi/protocols.h
> +++ b/drivers/firmware/arm_scmi/protocols.h
> @@ -256,7 +256,8 @@ struct scmi_fc_info {
>   */
>  struct scmi_proto_helpers_ops {
>  	int (*extended_name_get)(const struct scmi_protocol_handle *ph,
> -				 u8 cmd_id, u32 res_id, char *name, size_t len);
> +				 u8 cmd_id, u32 res_id, u32 *flags, char *name,
> +				 size_t len);
>  	void *(*iter_response_init)(const struct scmi_protocol_handle *ph,
>  				    struct scmi_iterator_ops *ops,
>  				    unsigned int max_resources, u8 msg_id,
> diff --git a/drivers/firmware/arm_scmi/reset.c b/drivers/firmware/arm_scmi/reset.c
> index e9afa8cab730..7217fd7c6afa 100644
> --- a/drivers/firmware/arm_scmi/reset.c
> +++ b/drivers/firmware/arm_scmi/reset.c
> @@ -128,7 +128,8 @@ scmi_reset_domain_attributes_get(const struct scmi_protocol_handle *ph,
>  	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);
> +					    NULL, dom_info->name,
> +					    SCMI_MAX_STR_SIZE);
>  
>  	return ret;
>  }
> diff --git a/drivers/firmware/arm_scmi/sensors.c b/drivers/firmware/arm_scmi/sensors.c
> index 0b5853fa9d87..9952a7bc6682 100644
> --- a/drivers/firmware/arm_scmi/sensors.c
> +++ b/drivers/firmware/arm_scmi/sensors.c
> @@ -644,7 +644,7 @@ iter_sens_descr_process_response(const struct scmi_protocol_handle *ph,
>  	if (PROTOCOL_REV_MAJOR(si->version) >= 0x3 &&
>  	    SUPPORTS_EXTENDED_NAMES(attrl))
>  		ph->hops->extended_name_get(ph, SENSOR_NAME_GET, s->id,
> -					    s->name, SCMI_MAX_STR_SIZE);
> +					    NULL, s->name, SCMI_MAX_STR_SIZE);
>  
>  	if (s->extended_scalar_attrs) {
>  		s->sensor_power = le32_to_cpu(sdesc->power);
> diff --git a/drivers/firmware/arm_scmi/voltage.c b/drivers/firmware/arm_scmi/voltage.c
> index eaa8d944926a..36e2df77738c 100644
> --- a/drivers/firmware/arm_scmi/voltage.c
> +++ b/drivers/firmware/arm_scmi/voltage.c
> @@ -242,7 +242,7 @@ static int scmi_voltage_descriptors_get(const struct scmi_protocol_handle *ph,
>  			if (SUPPORTS_EXTENDED_NAMES(attributes))
>  				ph->hops->extended_name_get(ph,
>  							VOLTAGE_DOMAIN_NAME_GET,
> -							v->id, v->name,
> +							v->id, NULL, v->name,
>  							SCMI_MAX_STR_SIZE);
>  			if (SUPPORTS_ASYNC_LEVEL_SET(attributes))
>  				v->async_level_set = true;
> -- 
> 2.42.0
> 

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel