Unverified Commit 5106e65f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'scmi-fix-6.6' of... 

Merge tag 'scmi-fix-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/fixes

Arm SCMI fix for v6.6

A single fix to address scmi_perf_attributes_get() using the protocol
version even before it was populated and ending up with unexpected
bogowatts power scale.

* tag 'scmi-fix-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
  firmware: arm_scmi: Fixup perf power-cost/microwatt support

Link: https://lore.kernel.org/r/20230927121604.158645-1-sudeep.holla@arm.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 79684f2e c3638b85

drivers/firmware/arm_scmi/perf.c

+2 −2
Original line number Diff line number Diff line
@@ -1080,6 +1080,8 @@ static int scmi_perf_protocol_init(const struct scmi_protocol_handle *ph) 
	if (!pinfo)

		return -ENOMEM;



	pinfo->version = version;



	ret = scmi_perf_attributes_get(ph, pinfo);

	if (ret)

		return ret;
@@ -1104,8 +1106,6 @@ static int scmi_perf_protocol_init(const struct scmi_protocol_handle *ph) 
	if (ret)

		return ret;



	pinfo->version = version;



	return ph->set_priv(ph, pinfo);

}