Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Arnd Bergmann <arnd@arndb.de>

+2 -2
+2 -2
drivers/firmware/arm_scmi/perf.c
··· 1080 1080 if (!pinfo) 1081 1081 return -ENOMEM; 1082 1082 1083 + pinfo->version = version; 1084 + 1083 1085 ret = scmi_perf_attributes_get(ph, pinfo); 1084 1086 if (ret) 1085 1087 return ret; ··· 1105 1103 ret = devm_add_action_or_reset(ph->dev, scmi_perf_xa_destroy, pinfo); 1106 1104 if (ret) 1107 1105 return ret; 1108 - 1109 - pinfo->version = version; 1110 1106 1111 1107 return ph->set_priv(ph, pinfo); 1112 1108 }