From: Philip Radford <philip.radford@arm.com>
To: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, arm-scmi@vger.kernel.org,
linux-pm@vger.kernel.org
Cc: sudeep.holla@arm.com, james.quinlan@broadcom.com,
f.fainelli@gmail.com, vincent.guittot@linaro.org,
etienne.carriere@st.com, peng.fan@oss.nxp.com,
michal.simek@amd.com, quic_sibis@quicinc.com,
dan.carpenter@linaro.org, d-gole@ti.com,
souvik.chakravarty@arm.com,
Philip Radford <philip.radford@arm.com>
Subject: [PATCH v4 06/11] firmware: arm_scmi: Extend powercap report to include MAI
Date: Wed, 1 Apr 2026 10:53:44 +0100 [thread overview]
Message-ID: <20260401095349.2217840-7-philip.radford@arm.com> (raw)
In-Reply-To: <20260401095349.2217840-1-philip.radford@arm.com>
Extend scmi_powercap_meas_changed_report to include MAI change
notifications.
Signed-off-by: Philip Radford <philip.radford@arm.com>
---
drivers/firmware/arm_scmi/powercap.c | 20 ++++++++++++--------
include/linux/scmi_protocol.h | 1 +
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/drivers/firmware/arm_scmi/powercap.c b/drivers/firmware/arm_scmi/powercap.c
index 1d1188e98d49..b9d50f4e8ae5 100644
--- a/drivers/firmware/arm_scmi/powercap.c
+++ b/drivers/firmware/arm_scmi/powercap.c
@@ -11,6 +11,7 @@
#include <linux/io.h>
#include <linux/module.h>
#include <linux/scmi_protocol.h>
+#include <linux/stddef.h>
#include <trace/events/scmi.h>
@@ -164,6 +165,7 @@ struct scmi_powercap_meas_changed_notify_payld {
__le32 agent_id;
__le32 domain_id;
__le32 power;
+ __le32 mai;
};
struct scmi_msg_powercap_cpc {
@@ -1212,13 +1214,6 @@ static int scmi_powercap_notify(const struct scmi_protocol_handle *ph,
if (ret)
return ret;
- if (enable && !low && !high) {
- dev_err(ph->dev,
- "Invalid Measurements Notify thresholds: %u/%u\n",
- low, high);
- return -EINVAL;
- }
-
ret = ph->xops->xfer_get_init(ph, message_id,
sizeof(*notify), 0, &t);
if (ret)
@@ -1333,14 +1328,23 @@ scmi_powercap_fill_custom_report(const struct scmi_protocol_handle *ph,
{
const struct scmi_powercap_meas_changed_notify_payld *p = payld;
struct scmi_powercap_meas_changed_report *r = report;
+ const size_t sz_v2 = offsetofend(struct scmi_powercap_meas_changed_notify_payld,
+ power);
+ const size_t sz_v3 = sizeof(*p);
- if (sizeof(*p) != payld_sz)
+ if (payld_sz != sz_v2 && payld_sz != sz_v3)
break;
r->timestamp = timestamp;
r->agent_id = le32_to_cpu(p->agent_id);
r->domain_id = le32_to_cpu(p->domain_id);
r->power = le32_to_cpu(p->power);
+
+ if (payld_sz == sz_v3 && PROTOCOL_REV_MAJOR(ph->version) >= 0x3)
+ r->mai = le32_to_cpu(p->mai);
+ else
+ r->mai = 0;
+
*src_id = r->domain_id;
rep = r;
break;
diff --git a/include/linux/scmi_protocol.h b/include/linux/scmi_protocol.h
index 299fa8499b3f..d0f6c0102559 100644
--- a/include/linux/scmi_protocol.h
+++ b/include/linux/scmi_protocol.h
@@ -1134,5 +1134,6 @@ struct scmi_powercap_meas_changed_report {
unsigned int agent_id;
unsigned int domain_id;
unsigned int power;
+ unsigned int mai;
};
#endif /* _LINUX_SCMI_PROTOCOL_H */
--
2.47.3
next prev parent reply other threads:[~2026-04-01 9:54 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-01 9:53 [PATCH v4 00/11] Add support for SCMIv4.0 Powercap Extensions Philip Radford
2026-04-01 9:53 ` [PATCH v4 01/11] firmware: arm_scmi: Add an optional custom parameter to fastchannel helpers Philip Radford
2026-04-01 9:53 ` [PATCH v4 02/11] firmware: arm_scmi: Refactor powercap domain layout Philip Radford
2026-04-01 9:53 ` [PATCH v4 03/11] firmware: arm_scmi: Add SCMIv4.0 Powercap basic support Philip Radford
2026-04-01 9:53 ` [PATCH v4 04/11] firmware: arm_scmi: Add SCMIv4.0 Powercap FCs support Philip Radford
2026-04-01 9:53 ` [PATCH v4 05/11] firmware: arm_scmi: Add SCMIV4.0 Powercap notifications support Philip Radford
2026-04-01 9:53 ` Philip Radford [this message]
2026-04-01 9:53 ` [PATCH v4 07/11] include: trace: Add new parameter to trace_scmi_fc_call Philip Radford
2026-04-01 9:53 ` [PATCH v4 08/11] powercap: arm_scmi: Enable multiple constraints support Philip Radford
2026-04-01 9:53 ` [PATCH v4 09/11] firmware: arm_scmi: add Powercap MAI get/set support Philip Radford
2026-04-01 9:53 ` [PATCH v4 10/11] powercap: arm_scmi: Create synthetic parent node for multi-instance Philip Radford
2026-04-01 9:53 ` [PATCH v4 11/11] powercap: arm_scmi: Add get_power_uw to synthetic node Philip Radford
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260401095349.2217840-7-philip.radford@arm.com \
--to=philip.radford@arm.com \
--cc=arm-scmi@vger.kernel.org \
--cc=d-gole@ti.com \
--cc=dan.carpenter@linaro.org \
--cc=etienne.carriere@st.com \
--cc=f.fainelli@gmail.com \
--cc=james.quinlan@broadcom.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=michal.simek@amd.com \
--cc=peng.fan@oss.nxp.com \
--cc=quic_sibis@quicinc.com \
--cc=souvik.chakravarty@arm.com \
--cc=sudeep.holla@arm.com \
--cc=vincent.guittot@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox