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 CF8D7C44501 for ; Wed, 1 Jul 2026 12:58:33 +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=DF7mSimWc0oC8DiANsGntqqyRpZ7spY9QO/5kDa4cJo=; b=0KmsVBpukk7iNKC850yZk7oWGD CwOhAXDjdb8kzlKefgNHlqDcfx41M1FvKf9A1mjXJs/+Hv//jrDmqQUSiNs6I7RqnSNbIuCLBLmlU REX51TP/3v9XNaAibMENFc7x4OeewEUfcmlSaJInHyVFq5+PDF1354gbzdZ0jX1c3nvNYYUxWe+UY 1/50+dwLHU9EdWqdztHVoOC1tQ5SHHAinnK2W/Eaa01q5XHa+Zk57GksyKYq+1IxyKHGy9SvGS+75 j6Oyn4Pvvfh7rkklA2CWkh+TBg0aXcVdg7upt7Spl5rtAl5DCHBMXH/TjTMHxVdL/YBAEQdvw4ehr 4z3d0CyQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1weuWJ-000000025ZD-1mzd; Wed, 01 Jul 2026 12:58:27 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1weuWI-000000025Xr-3JUU for linux-arm-kernel@bombadil.infradead.org; Wed, 01 Jul 2026 12:58:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=DF7mSimWc0oC8DiANsGntqqyRpZ7spY9QO/5kDa4cJo=; b=GNVei9jcLnM7UsZZBPj3tjWevx snY9MNyEqmHFFFyKhbgdcXvCdjwYccuuI27+cFSF41idNzPSksegn6XcIk73QihmJElXrOjutXi7g ekzNRiHbMoFb11awzxPgxNKa48tT9NChCi+J2NiRivNFFBp6MjtuHX5Y4Azw36zOh927X/3sIyXzW vv3/zsGq+xsKAWbnoMZUvbElo+ZBNr2CzWcemc/KkBbTIh+70XycfN9xNXH+mVXb5r2LMYB4cyygK DZoy24v0RHbY72E4qI9yruWyX50g3kC+q9ei2WIq3Ik5Z8Mi7XFfu0R8Ri+LPKim9pORQ5odMrAO3 di8by1jw==; Received: from foss.arm.com ([217.140.110.172]) by desiato.infradead.org with esmtp (Exim 4.99.2 #2 (Red Hat Linux)) id 1weuWF-00000002nIm-36Ik for linux-arm-kernel@lists.infradead.org; Wed, 01 Jul 2026 12:58:25 +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 8BABF168F; Wed, 1 Jul 2026 05:58:17 -0700 (PDT) Received: from oss-apollo7005.oss.cambridge.arm.com (oss-apollo7005.oss.lab.cambridge.arm.com [10.7.15.171]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id AD8323F85F; Wed, 1 Jul 2026 05:58:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1782910701; bh=d/ez46M8JR6nHFeAaTkavV1BjE9Sl9hl/s65oL5R7v4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZV/X08I1+5jK/R1W+bwPKNT2Gr6Fa15qpIrvm6eIkvY/aMmkvuBaUEf8M/1gPpKn+ plvw5TebzTmnJlcf+Uwlg0aRO//VEaUxLlghKM9OyJbGBzyPTJILTvNCQQDZit/9P3 drLoXYhWephuaFvKe+T85SNNltHq3sFu13r2p4hE= 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 v8 07/13] firmware: arm_scmi: Extend powercap report to include MAI Date: Wed, 1 Jul 2026 12:57:41 +0000 Message-Id: <20260701125747.407921-8-philip.radford@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260701125747.407921-1-philip.radford@arm.com> References: <20260701125747.407921-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-20260701_135824_044041_1E1B8767 X-CRM114-Status: GOOD ( 17.24 ) 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 --- 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 65fac7fc6169..653b0656a9bd 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_V3 (sizeof(struct scmi_powercap_meas_changed_notify_payld)) +#define SZ_V2 (SZ_V3 - 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 { @@ -1215,24 +1219,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) @@ -1348,13 +1346,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 ce00106d2b65..583122037bf6 100644 --- a/include/linux/scmi_protocol.h +++ b/include/linux/scmi_protocol.h @@ -1138,5 +1138,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.25.1