Commit 5bc45db5 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'scmi-updates-4.20' of... 

Merge tag 'scmi-updates-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into next/drivers

SCMI updates for v4.20

1. Addition of interface to fetch estimated power from the firmware
   corresponding to each OPP of a device

2. Cleanup using strlcpy to ensure NULL-terminated strings for name
   strings instead of relying on the firmware to do the same

* tag 'scmi-updates-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux

:
  firmware: arm_scmi: add a getter for power of performance states
  firmware: arm_scmi: use strlcpy to ensure NULL-terminated strings

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents cdddeefc 1a63fe9a

drivers/firmware/arm_scmi/base.c

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static int scmi_base_discover_agent_get(const struct scmi_handle *handle, 


	ret = scmi_do_xfer(handle, t);

	if (!ret)

		memcpy(name, t->rx.buf, SCMI_MAX_STR_SIZE);

		strlcpy(name, t->rx.buf, SCMI_MAX_STR_SIZE);



	scmi_xfer_put(handle, t);

drivers/firmware/arm_scmi/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static int scmi_clock_attributes_get(const struct scmi_handle *handle, 


	ret = scmi_do_xfer(handle, t);

	if (!ret)

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

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

	else

		clk->name[0] = '\0';

drivers/firmware/arm_scmi/perf.c

+29 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ scmi_perf_domain_attributes_get(const struct scmi_handle *handle, u32 domain, 
			dom_info->mult_factor =

					(dom_info->sustained_freq_khz * 1000) /

					dom_info->sustained_perf_level;

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

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

	}



	scmi_xfer_put(handle, t);
@@ -427,6 +427,33 @@ static int scmi_dvfs_freq_get(const struct scmi_handle *handle, u32 domain, 
	return ret;

}



static int scmi_dvfs_est_power_get(const struct scmi_handle *handle, u32 domain,

				   unsigned long *freq, unsigned long *power)

{

	struct scmi_perf_info *pi = handle->perf_priv;

	struct perf_dom_info *dom;

	unsigned long opp_freq;

	int idx, ret = -EINVAL;

	struct scmi_opp *opp;



	dom = pi->dom_info + domain;

	if (!dom)

		return -EIO;



	for (opp = dom->opp, idx = 0; idx < dom->opp_count; idx++, opp++) {

		opp_freq = opp->perf * dom->mult_factor;

		if (opp_freq < *freq)

			continue;



		*freq = opp_freq;

		*power = opp->power;

		ret = 0;

		break;

	}



	return ret;

}



static struct scmi_perf_ops perf_ops = {

	.limits_set = scmi_perf_limits_set,

	.limits_get = scmi_perf_limits_get,
@@ -437,6 +464,7 @@ static struct scmi_perf_ops perf_ops = { 
	.device_opps_add = scmi_dvfs_device_opps_add,

	.freq_set = scmi_dvfs_freq_set,

	.freq_get = scmi_dvfs_freq_get,

	.est_power_get = scmi_dvfs_est_power_get,

};



static int scmi_perf_protocol_init(struct scmi_handle *handle)

drivers/firmware/arm_scmi/power.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ scmi_power_domain_attributes_get(const struct scmi_handle *handle, u32 domain, 
		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);

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

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

	}



	scmi_xfer_put(handle, t);

drivers/firmware/arm_scmi/sensors.c

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ static int scmi_sensor_description_get(const struct scmi_handle *handle, 
			s = &si->sensors[desc_index + cnt];

			s->id = le32_to_cpu(buf->desc[cnt].id);

			s->type = SENSOR_TYPE(attrh);

			memcpy(s->name, buf->desc[cnt].name, SCMI_MAX_STR_SIZE);

			strlcpy(s->name, buf->desc[cnt].name, SCMI_MAX_STR_SIZE);

		}



		desc_index += num_returned;

CRA Git | Maintained and supported by SUSTech CRA and CCSE