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 74AA0C43327 for ; Wed, 1 Jul 2026 12:58:42 +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=EyFSWXkfTAreZQEoE+jIAIj47B5WLIXkope5e1tVeBI=; b=S+epnydcQsBlDj7v90ZDvG2aGf ZjC6pEXHusrEYe+oe/UImP2Bji7RkLbP7zV2jUHzJXbOer5n05CQzejANyHzZ7N/Naq6GI+1nTJWy 1GxgiWAjtgDeOHYO1eGhecJfmihrUGI44pjIRjIvXtJlj60AIAzNmTHDj6aQkwTodEi338ltYUVpd SjXcvnEOCYKHkXrwIe7uOSUUDTF4/PhTMQibO+LtvgCRSK2D99w6HjqV+87E9B9tlnvtZcomTtH5x pit778BV6PEcbpy+jUzwfzXXyB0zIch+IzjjUt9v/Pxi+rFPZTBEm17mGzAaCkp1UoHxMzrCV0OEo zh8pERzw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1weuWR-000000025ku-460l; Wed, 01 Jul 2026 12:58:35 +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 1weuWQ-000000025hW-0qXQ for linux-arm-kernel@bombadil.infradead.org; Wed, 01 Jul 2026 12:58:34 +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=EyFSWXkfTAreZQEoE+jIAIj47B5WLIXkope5e1tVeBI=; b=AN7kV0bhlaX2IdPEbS7VZG7dMT fjyLrewdIeUtftbWiG0A0DY+twO6bqauSRndQ5Doe65HrLLpHICRh+3kZgK578IhpDc+kkktJTYXD H0JW2MkAqFiLXJLY2JqQvPEYlnpJI2ib6pTwvWkBYr9s2vAKHfnTfFUrfbbApBTM2NwXG7OwhHyMs nbWRazezjg9mz/bdBigKJrm+EQCQvpf/IA68iOhGnZm/ArS99jUPS6scxbPiz1z6ILbmds4Ix2HXt TGDN4LxCnu+NIGaG/H0UHAQda/BbSD2hBRhQ+mCyAbU1mBeG5eXJ+k+tkSwc4ck7vCEnjFtcozotN c50i3JDQ==; Received: from foss.arm.com ([217.140.110.172]) by desiato.infradead.org with esmtp (Exim 4.99.2 #2 (Red Hat Linux)) id 1weuWN-00000002nKG-11OY for linux-arm-kernel@lists.infradead.org; Wed, 01 Jul 2026 12:58:33 +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 A2CAE168F; Wed, 1 Jul 2026 05:58:25 -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 C41703F85F; Wed, 1 Jul 2026 05:58:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1782910710; bh=5v9gGDUwYkaYNVuwKOWMLSWob2ZXgcTC9UKR9ERN438=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YXEX31i9521r9vQV4uygTNXbLZcE/uQiZ+jmNKDn3vNBAVcCn/rfKbULIM3+oa+FA VA0kUG8I608xbON83VE2CZgHbFL6Zvcg/4VDj5QXXQhNhrdAFEd/+ALt/cK7daAY+y vS2PbecfFt85OL1791+wMuP32tZaSd3MxUz5rdSo= 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 10/13] firmware: arm_scmi: add Powercap MAI get/set support Date: Wed, 1 Jul 2026 12:57:44 +0000 Message-Id: <20260701125747.407921-11-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_135831_562821_6C6FE564 X-CRM114-Status: GOOD ( 15.64 ) 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 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 | 127 +++++++++++++++++++++++++++ include/linux/scmi_protocol.h | 18 ++++ 2 files changed, 145 insertions(+) diff --git a/drivers/firmware/arm_scmi/powercap.c b/drivers/firmware/arm_scmi/powercap.c index 32371018bf1d..0d75a754f8bb 100644 --- a/drivers/firmware/arm_scmi/powercap.c +++ b/drivers/firmware/arm_scmi/powercap.c @@ -407,6 +407,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 invalid 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 = @@ -1098,6 +1126,103 @@ 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, @@ -1110,6 +1235,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 583122037bf6..eeb5e609e782 100644 --- a/include/linux/scmi_protocol.h +++ b/include/linux/scmi_protocol.h @@ -658,6 +658,12 @@ struct scmi_powercap_cpl_info { * reports power data on an abstract linear scale. * @extended_names: Support for long names. * @fastchannels: Support for at least one fastchannel, + * @mai_config: MAI configuration support. + * @min_mai: Minimum supported Power Measurement Averaging Interval in + * microseconds. + * @max_mai: Maximum supporte Power Measurement Averaging Interval in + microseconds. + * @mai_step: Step size between supported MAI values in microseconds. * @name: name assigned to the Powercap Domain by platform. * @sustainable_power: Maximum sustainable power consumption for this domain * under normal conditions. @@ -679,6 +685,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; @@ -737,6 +747,10 @@ struct scmi_powercap_info { * @measurements_threshold_get: get the currently configured low and high power * thresholds used when registering callbacks for * notification POWERCAP_MEASUREMENTS_NOTIFY. + * @measurements_interval_get: get the current Power Measurement Averaging + * Interval (MAI) value for the specified domain. + * @measurements_interval_set: set the Power Measurement Averaging Interval + * (MAI) value for the specified domain. */ struct scmi_powercap_proto_ops { int (*num_domains_get)(const struct scmi_protocol_handle *ph); @@ -762,6 +776,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.25.1