From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3E0893E8686; Tue, 28 Apr 2026 09:10:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777367402; cv=none; b=TYCQSTHJ1YQlq+LoPngNcDJ32lWUQPS/agnOr9cCu7+3N+OE9L1/v3VrU5X4O2kROrdzO+fET4IYkK8vdVioX1njsK+Mu6n4R7Xh95WeeyD/RjMbf1rHghsxdLQzJIZFGaqBPAT2WOvBGTogQA94Nwfpye6EnxmwMm5H/PKoCeM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777367402; c=relaxed/simple; bh=fGTDs7etBZ5H/GQTSLQEv52V4Q3YH+CUK63mD+F4yo4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AnPFrOXHW4VgcH1LGtPiYhnjZePpEvUT1+jqxUeKbLi1M7pvgGvXtKoaExmrrjVbc+Yfb06W7Ca4XVZLdJURd5V61LfpuOg4NUyAIymVsAg0odbZ9QXgP7ncERO1js1JyQtDg2EkNukNEMxdfKzoTnE8mZaxR4MpA+Mop0wPl2g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b=E5R5nAEH; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b="E5R5nAEH" 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 3235716A3; Tue, 28 Apr 2026 02:09:55 -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 5F7D53F62B; Tue, 28 Apr 2026 02:09:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1777367400; bh=fGTDs7etBZ5H/GQTSLQEv52V4Q3YH+CUK63mD+F4yo4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E5R5nAEHVFr6/USnqbusaFhb8vrgBzD+lWsvlveBAEINXzlmAWQS1Onbejr2pKsY1 f8/wpdk+4TiygqVQ6ijXIW+PimSivRKF8yMshXXEhiYwTssoZWt25GHb4alAzHEsO6 JqeTkQaktmr3WNnb5DevbLt7FBXpmyHpRQKPxGuQ= 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 v5 09/12] firmware: arm_scmi: add Powercap MAI get/set support Date: Tue, 28 Apr 2026 10:09:18 +0100 Message-ID: <20260428090922.346069-10-philip.radford@arm.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260428090922.346069-1-philip.radford@arm.com> References: <20260428090922.346069-1-philip.radford@arm.com> Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Add support for Power Measurement Averaging Interval (MAI) get and set operations to the SCMI powercap protocol driver. Extends scmi_powercap_info to store MAI configuration and implement MAI get/set via xfer and optional fast-channel support. Signed-off-by: Philip Radford --- drivers/firmware/arm_scmi/powercap.c | 120 +++++++++++++++++++++++++++ include/linux/scmi_protocol.h | 8 ++ 2 files changed, 128 insertions(+) diff --git a/drivers/firmware/arm_scmi/powercap.c b/drivers/firmware/arm_scmi/powercap.c index 86262eb0f34a..b5879f204b5e 100644 --- a/drivers/firmware/arm_scmi/powercap.c +++ b/drivers/firmware/arm_scmi/powercap.c @@ -401,6 +401,34 @@ scmi_powercap_domain_attrs_process(const struct scmi_protocol_handle *ph, dom_info->notify_powercap_measurement_change = SUPPORTS_POWERCAP_MEASUREMENTS_CHANGE_NOTIFY(flags); + if (PROTOCOL_REV_MAJOR(ph->version) >= 0x3) { + struct scmi_msg_resp_powercap_domain_attributes_v3 *resp_v3 = r; + + flags = le32_to_cpu(resp_v3->attributes); + if (pinfo->notify_measurements_cmd) + dom_info->notify_powercap_measurement_change = + SUPPORTS_POWERCAP_MEASUREMENTS_CHANGE_NOTIFY(flags); + + dom_info->mai_config = SUPPORTS_POWERCAP_MAI_CONFIGURATION(flags); + dom_info->min_mai = le32_to_cpu(resp_v3->min_mai); + dom_info->max_mai = le32_to_cpu(resp_v3->max_mai); + dom_info->mai_step = le32_to_cpu(resp_v3->mai_step); + + if (dom_info->mai_config) { + ret = scmi_powercap_validate(dom_info->min_mai, + dom_info->max_mai, + dom_info->mai_step, + dom_info->mai_config); + + if (ret) { + dev_warn(ph->dev, "Platform reported problem MAI config for domain %d - %s\n", + dom_info->id, dom_info->name); + + return ret; + } + } + } + dom_info->extended_names = SUPPORTS_EXTENDED_NAMES(flags); dom_info->async_powercap_cap_set = @@ -1082,6 +1110,96 @@ static int scmi_powercap_cap_enable_get(const struct scmi_protocol_handle *ph, return 0; } +static int scmi_powercap_xfer_mai_get(const struct scmi_protocol_handle *ph, u32 domain_id, + u32 *mai) +{ + int ret; + struct scmi_xfer *t; + + ret = ph->xops->xfer_get_init(ph, POWERCAP_MAI_GET, sizeof(u32), + sizeof(u32), &t); + + if (ret) + return ret; + + put_unaligned_le32(domain_id, t->tx.buf); + + ret = ph->xops->do_xfer(ph, t); + if (!ret) + *mai = get_unaligned_le32(t->rx.buf); + + ph->xops->xfer_put(ph, t); + return ret; +} + +static int scmi_powercap_xfer_mai_set(const struct scmi_protocol_handle *ph, u32 domain_id, u32 mai) +{ + int ret; + struct scmi_xfer *t; + struct scmi_msg_powercap_cap_or_pai_set *msg; + + ret = ph->xops->xfer_get_init(ph, POWERCAP_MAI_SET, sizeof(*msg), 0, &t); + if (ret) + return ret; + + msg = t->tx.buf; + msg->domain_id = cpu_to_le32(domain_id); + msg->flags = cpu_to_le32(0); + msg->value = cpu_to_le32(mai); + + ret = ph->xops->do_xfer(ph, t); + + ph->xops->xfer_put(ph, t); + return ret; +} + +static int scmi_powercap_measurements_interval_get(const struct scmi_protocol_handle *ph, + u32 domain_id, u32 *val) +{ + const struct scmi_powercap_info *pc; + struct scmi_fc_info *fci; + + if (!val) + return -EINVAL; + + pc = scmi_powercap_dom_info_get(ph, domain_id); + if (!pc) + return -EINVAL; + + fci = pc->cpli[CPL0].fc_info; + if (fci && fci[POWERCAP_FC_MAI].get_addr) { + *val = ioread32(fci[POWERCAP_FC_MAI].get_addr); + trace_scmi_fc_call(SCMI_PROTOCOL_POWERCAP, POWERCAP_MAI_GET, domain_id, 0, *val, 0); + return 0; + } + + return scmi_powercap_xfer_mai_get(ph, domain_id, val); +} + +static int scmi_powercap_measurements_interval_set(const struct scmi_protocol_handle *ph, + u32 domain_id, u32 val) +{ + const struct scmi_powercap_info *pc; + struct scmi_fc_info *fci; + + pc = scmi_powercap_dom_info_get(ph, domain_id); + if (!pc) + return -EINVAL; + + if (!pc->mai_config || !val || val < pc->min_mai || val > pc->max_mai) + return -EINVAL; + + fci = pc->cpli[CPL0].fc_info; + if (fci && fci[POWERCAP_FC_MAI].set_addr) { + iowrite32(val, fci[POWERCAP_FC_MAI].set_addr); + ph->hops->fastchannel_db_ring(fci[POWERCAP_FC_MAI].set_db); + trace_scmi_fc_call(SCMI_PROTOCOL_POWERCAP, POWERCAP_MAI_SET, domain_id, 0, val, 0); + return 0; + } + + return scmi_powercap_xfer_mai_set(ph, domain_id, val); +} + static const struct scmi_powercap_proto_ops powercap_proto_ops = { .num_domains_get = scmi_powercap_num_domains_get, .info_get = scmi_powercap_dom_info_get, @@ -1094,6 +1212,8 @@ static const struct scmi_powercap_proto_ops powercap_proto_ops = { .measurements_get = scmi_powercap_measurements_get, .measurements_threshold_set = scmi_powercap_measurements_threshold_set, .measurements_threshold_get = scmi_powercap_measurements_threshold_get, + .measurements_interval_get = scmi_powercap_measurements_interval_get, + .measurements_interval_set = scmi_powercap_measurements_interval_set, }; static void scmi_powercap_domain_init_fc(const struct scmi_protocol_handle *ph, diff --git a/include/linux/scmi_protocol.h b/include/linux/scmi_protocol.h index d0f6c0102559..73d66281dcc3 100644 --- a/include/linux/scmi_protocol.h +++ b/include/linux/scmi_protocol.h @@ -675,6 +675,10 @@ struct scmi_powercap_info { bool powercap_scale_uw; bool extended_names; bool fastchannels; + bool mai_config; + u32 min_mai; + u32 max_mai; + u32 mai_step; char name[SCMI_MAX_STR_SIZE]; unsigned int sustainable_power; unsigned int accuracy; @@ -758,6 +762,10 @@ struct scmi_powercap_proto_ops { int (*measurements_threshold_get)(const struct scmi_protocol_handle *ph, u32 domain_id, u32 *power_thresh_low, u32 *power_thresh_high); + int (*measurements_interval_get)(const struct scmi_protocol_handle *ph, + u32 domain_id, u32 *val); + int (*measurements_interval_set)(const struct scmi_protocol_handle *ph, + u32 domain_id, u32 val); }; enum scmi_pinctrl_selector_type { -- 2.47.3