From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 12044CD4F4A for ; Mon, 18 May 2026 13:53:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ZrvwZhJmfMHXBpttOnhkg5VStJNhrv9tqJNu2e5hZLo=; b=0Fil2gaZGbRi60AkUwQpsp7iZ2 rYMpiP5RV1jhswQUX8HYnaLa/1VOYU+RrkPERZj1MdF5xpI6sMJgIFVKdZ60ek7KBvxLJMo/bTpHr WV4ZLNckuRWoc2/E/Z1tQrfKUYSdXeCNgDMRZbm1OW/GEeylQi0V6LVh531t9r4D+g/1B1ykthzKd 7zw2M3nL0y2oHr2Ul/KIbXVtYg/Npu2S4lSwVE1zhqiHHxV0MIJYnXm7DFi8g5lXMZC4N7Y7eYzDI 9rIHKYYD7wA2BeEo/K461h0xyQoK7zgwuozWKhBxn7mRx5ZeIU+Wi05aNOysCzF9lst0KrNI+B1mm Cr21ae3Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wOyP5-0000000FrwM-3CN1; Mon, 18 May 2026 13:53:07 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wOyP2-0000000Frt2-0r86 for linux-arm-kernel@lists.infradead.org; Mon, 18 May 2026 13:53:05 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A07061D6F; Mon, 18 May 2026 06:52:57 -0700 (PDT) Received: from donnerap.manchester.arm.com (donnerap.manchester.arm.com [10.33.8.81]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C89D43F7B4; Mon, 18 May 2026 06:53:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1779112382; bh=QnD9RSG/JDNn4vcquQDqlzUS6esWyYJrw8vo7lKbVhM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zk66Za2zEmQaJdMziPw9wN4qmR9ud2LAFtA35HoBj41jGCfBFUS1lw/hphr3uABhP csn6Nt7cJQTmeIIq+7ACzM2GiveEIqzbGAknhva68oimD+8eyrb9kol3rsMofUYDVl Od6DNMF1BhSWGJtKs+JNauA1D7ccMHWh5Eumeuzs= From: Philip Radford 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 Subject: [PATCH v6 06/12] firmware: arm_scmi: Extend powercap report to include MAI Date: Mon, 18 May 2026 14:52:28 +0100 Message-ID: <20260518135234.2953532-7-philip.radford@arm.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260518135234.2953532-1-philip.radford@arm.com> References: <20260518135234.2953532-1-philip.radford@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260518_065304_337208_3AE5E123 X-CRM114-Status: GOOD ( 17.26 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Extend scmi_powercap_meas_changed_report to include MAI change notifications. Signed-off-by: Philip Radford --- V5->V6 - Re-worded existing comment for POWERCAP_MEASUREMENTS_NOTIFY - Added define for V2/V3 sizes - Used new definitions --- drivers/firmware/arm_scmi/powercap.c | 28 +++++++++++++++------------- include/linux/scmi_protocol.h | 1 + 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/drivers/firmware/arm_scmi/powercap.c b/drivers/firmware/arm_scmi/powercap.c index 1d1188e98d49..fdfaf03277ab 100644 --- a/drivers/firmware/arm_scmi/powercap.c +++ b/drivers/firmware/arm_scmi/powercap.c @@ -11,6 +11,7 @@ #include #include #include +#include #include @@ -21,6 +22,8 @@ #define SCMI_PROTOCOL_SUPPORTED_VERSION 0x30000 #define CPL0 0 +#define SZ_V2 (sizeof(struct scmi_powercap_meas_changed_notify_payld)) +#define SZ_V3 (SZ_V2 - sizeof(__le32)) enum scmi_powercap_protocol_cmd { POWERCAP_DOMAIN_ATTRIBUTES = 0x3, @@ -164,6 +167,7 @@ struct scmi_powercap_meas_changed_notify_payld { __le32 agent_id; __le32 domain_id; __le32 power; + __le32 mai; }; struct scmi_msg_powercap_cpc { @@ -1201,24 +1205,18 @@ static int scmi_powercap_notify(const struct scmi_protocol_handle *ph, struct scmi_msg_powercap_notify_thresh *notify; /* - * Note that we have to pick the most recently configured - * thresholds to build a proper POWERCAP_MEASUREMENTS_NOTIFY - * enable request and we fail, complaining, if no thresholds - * were ever set, since this is an indication the API has been - * used wrongly. + * Build the POWERCAP_MEASUREMENTS_NOTIFY enable request using the + * most recently configured thresholds. + * + * The absence of thresholds is not considered an error: + * notifications can still be generated to report MAI changes, even + * when low and high are set to zero. */ ret = scmi_powercap_measurements_threshold_get(ph, domain, &low, &high); 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) @@ -1334,13 +1332,17 @@ 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; - 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); + r->mai = 0; + if (payld_sz == SZ_V3 && PROTOCOL_REV_MAJOR(ph->version) >= 0x3) + r->mai = le32_to_cpu(p->mai); + *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