From nobody Wed Apr 8 04:58:21 2026 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 493633B4EBA; Tue, 10 Mar 2026 18:40:58 +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=1773168064; cv=none; b=fXUkqQmxSRF+VaJpa7YrwKLGK183aqZICfY/ysKvi8pEkVwO/uqWNUEntzhLG+0VGa9Fi09YG1jSF1G3CyBOznZMCirUK5sUYGDP9RHV8fMWZYAaKAJhWinOa0zVzyTae7vp46zr7EDLxn0iJ96hF9uqeoZXf/odxKtBnVsVJYM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773168064; c=relaxed/simple; bh=fJJelEs4dlfqo0M3gZyvgEKJPcdj/dOI+ns6rfZ+JSI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=g01AacAx2JExWA2KP/rbGPcn1cIGcbosN7B3sz5cPCA48gktrWRLlsQL2HfuBUCJeaOL5ZDSipe4BhCvxPs0WoRlJBCXb70lkPnkS6yBuEya3qq5qHduZCPf0mLVn+fDjrtPXUhagyaWO5reey7037lHBIJcb4wv2KrGgPCa7gA= 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; 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 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 75AF11596; Tue, 10 Mar 2026 11:40:51 -0700 (PDT) Received: from pluto.guest.local (usa-sjc-mx-foss1.foss.arm.com [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 4AE283F7BD; Tue, 10 Mar 2026 11:40:54 -0700 (PDT) From: Cristian Marussi To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, arm-scmi@vger.kernel.org, linux-clk@vger.kernel.org, linux-renesas-soc@vger.kernel.org Cc: sudeep.holla@arm.com, philip.radford@arm.com, james.quinlan@broadcom.com, f.fainelli@gmail.com, vincent.guittot@linaro.org, etienne.carriere@foss.st.com, peng.fan@oss.nxp.com, michal.simek@amd.com, dan.carpenter@linaro.org, geert+renesas@glider.be, kuninori.morimoto.gx@renesas.com, marek.vasut+renesas@gmail.com, Cristian Marussi Subject: [PATCH v2 04/13] firmware: arm_scmi: Simplify clock rates exposed interface Date: Tue, 10 Mar 2026 18:40:21 +0000 Message-ID: <20260310184030.3669330-5-cristian.marussi@arm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260310184030.3669330-1-cristian.marussi@arm.com> References: <20260310184030.3669330-1-cristian.marussi@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Introduce a new internal struct scmi_clock_desc so as to be able to hide, in the future, some of the needlessly public fields currently kept inside scmi_clock_info, while keeping exposed only the two new min_rate and max_rate fields for each clock. No functional change. Signed-off-by: Cristian Marussi Reviewed-by: Peng Fan --- v1 --> v2 - removed useless parenthesis - reworded comit message --- drivers/firmware/arm_scmi/clock.c | 145 +++++++++++++++--------------- include/linux/scmi_protocol.h | 2 + 2 files changed, 74 insertions(+), 73 deletions(-) diff --git a/drivers/firmware/arm_scmi/clock.c b/drivers/firmware/arm_scmi/= clock.c index 54b55517b759..467b13a3a18f 100644 --- a/drivers/firmware/arm_scmi/clock.c +++ b/drivers/firmware/arm_scmi/clock.c @@ -157,13 +157,27 @@ struct scmi_clock_rate_notify_payld { __le32 rate_high; }; =20 +struct scmi_clock_desc { + u32 id; + bool rate_discrete; + unsigned int num_rates; + u64 rates[SCMI_MAX_NUM_RATES]; +#define RATE_MIN 0 +#define RATE_MAX 1 +#define RATE_STEP 2 + struct scmi_clock_info info; +}; + +#define to_desc(p) (container_of(p, struct scmi_clock_desc, info)) + struct clock_info { int num_clocks; int max_async_req; bool notify_rate_changed_cmd; bool notify_rate_change_requested_cmd; atomic_t cur_async_req; - struct scmi_clock_info *clk; + struct scmi_clock_desc *clkds; +#define CLOCK_INFO(c, i) (&(((c)->clkds + (i))->info)) int (*clock_config_set)(const struct scmi_protocol_handle *ph, u32 clk_id, enum clk_state state, enum scmi_clock_oem_config oem_type, @@ -185,7 +199,7 @@ scmi_clock_domain_lookup(struct clock_info *ci, u32 clk= _id) if (clk_id >=3D ci->num_clocks) return ERR_PTR(-EINVAL); =20 - return ci->clk + clk_id; + return CLOCK_INFO(ci, clk_id); } =20 static int @@ -226,8 +240,7 @@ scmi_clock_protocol_attributes_get(const struct scmi_pr= otocol_handle *ph, =20 struct scmi_clk_ipriv { struct device *dev; - u32 clk_id; - struct scmi_clock_info *clk; + struct scmi_clock_desc *clkd; }; =20 static void iter_clk_possible_parents_prepare_message(void *message, unsig= ned int desc_index, @@ -236,7 +249,7 @@ static void iter_clk_possible_parents_prepare_message(v= oid *message, unsigned in struct scmi_msg_clock_possible_parents *msg =3D message; const struct scmi_clk_ipriv *p =3D priv; =20 - msg->id =3D cpu_to_le32(p->clk_id); + msg->id =3D cpu_to_le32(p->clkd->id); /* Set the number of OPPs to be skipped/already read */ msg->skip_parents =3D cpu_to_le32(desc_index); } @@ -246,7 +259,6 @@ static int iter_clk_possible_parents_update_state(struc= t scmi_iterator_state *st { const struct scmi_msg_resp_clock_possible_parents *r =3D response; struct scmi_clk_ipriv *p =3D priv; - struct device *dev =3D ((struct scmi_clk_ipriv *)p)->dev; u32 flags; =20 flags =3D le32_to_cpu(r->num_parent_flags); @@ -258,12 +270,13 @@ static int iter_clk_possible_parents_update_state(str= uct scmi_iterator_state *st * assume it's returned+remaining on first call. */ if (!st->max_resources) { - p->clk->num_parents =3D st->num_returned + st->num_remaining; - p->clk->parents =3D devm_kcalloc(dev, p->clk->num_parents, - sizeof(*p->clk->parents), - GFP_KERNEL); - if (!p->clk->parents) { - p->clk->num_parents =3D 0; + p->clkd->info.num_parents =3D st->num_returned + st->num_remaining; + p->clkd->info.parents =3D devm_kcalloc(p->dev, + p->clkd->info.num_parents, + sizeof(*p->clkd->info.parents), + GFP_KERNEL); + if (!p->clkd->info.parents) { + p->clkd->info.num_parents =3D 0; return -ENOMEM; } st->max_resources =3D st->num_returned + st->num_remaining; @@ -280,29 +293,27 @@ static int iter_clk_possible_parents_process_response= (const struct scmi_protocol const struct scmi_msg_resp_clock_possible_parents *r =3D response; struct scmi_clk_ipriv *p =3D priv; =20 - u32 *parent =3D &p->clk->parents[st->desc_index + st->loop_idx]; + u32 *parent =3D &p->clkd->info.parents[st->desc_index + st->loop_idx]; =20 *parent =3D le32_to_cpu(r->possible_parents[st->loop_idx]); =20 return 0; } =20 -static int scmi_clock_possible_parents(const struct scmi_protocol_handle *= ph, u32 clk_id, - struct scmi_clock_info *clk) +static int scmi_clock_possible_parents(const struct scmi_protocol_handle *= ph, + u32 clk_id, struct clock_info *cinfo) { struct scmi_iterator_ops ops =3D { .prepare_message =3D iter_clk_possible_parents_prepare_message, .update_state =3D iter_clk_possible_parents_update_state, .process_response =3D iter_clk_possible_parents_process_response, }; - + struct scmi_clock_desc *clkd =3D &cinfo->clkds[clk_id]; struct scmi_clk_ipriv ppriv =3D { - .clk_id =3D clk_id, - .clk =3D clk, + .clkd =3D clkd, .dev =3D ph->dev, }; void *iter; - int ret; =20 iter =3D ph->hops->iter_response_init(ph, &ops, 0, CLOCK_POSSIBLE_PARENTS_GET, @@ -311,9 +322,7 @@ static int scmi_clock_possible_parents(const struct scm= i_protocol_handle *ph, u3 if (IS_ERR(iter)) return PTR_ERR(iter); =20 - ret =3D ph->hops->iter_response_run(iter); - - return ret; + return ph->hops->iter_response_run(iter); } =20 static int @@ -352,7 +361,7 @@ static int scmi_clock_attributes_get(const struct scmi_= protocol_handle *ph, u32 attributes; struct scmi_xfer *t; struct scmi_msg_resp_clock_attributes *attr; - struct scmi_clock_info *clk =3D cinfo->clk + clk_id; + struct scmi_clock_info *clk =3D CLOCK_INFO(cinfo, clk_id); =20 ret =3D ph->xops->xfer_get_init(ph, CLOCK_ATTRIBUTES, sizeof(clk_id), sizeof(*attr), &t); @@ -394,7 +403,7 @@ static int scmi_clock_attributes_get(const struct scmi_= protocol_handle *ph, clk->rate_change_requested_notifications =3D true; if (PROTOCOL_REV_MAJOR(ph->version) >=3D 0x3) { if (SUPPORTS_PARENT_CLOCK(attributes)) - scmi_clock_possible_parents(ph, clk_id, clk); + scmi_clock_possible_parents(ph, clk_id, cinfo); if (SUPPORTS_GET_PERMISSIONS(attributes)) scmi_clock_get_permissions(ph, clk_id, clk); if (SUPPORTS_EXTENDED_CONFIG(attributes)) @@ -424,7 +433,7 @@ static void iter_clk_describe_prepare_message(void *mes= sage, struct scmi_msg_clock_describe_rates *msg =3D message; const struct scmi_clk_ipriv *p =3D priv; =20 - msg->id =3D cpu_to_le32(p->clk_id); + msg->id =3D cpu_to_le32(p->clkd->id); /* Set the number of rates to be skipped/already read */ msg->rate_index =3D cpu_to_le32(desc_index); } @@ -457,14 +466,14 @@ iter_clk_describe_update_state(struct scmi_iterator_s= tate *st, flags =3D le32_to_cpu(r->num_rates_flags); st->num_remaining =3D NUM_REMAINING(flags); st->num_returned =3D NUM_RETURNED(flags); - p->clk->rate_discrete =3D RATE_DISCRETE(flags); + p->clkd->rate_discrete =3D RATE_DISCRETE(flags); =20 /* Warn about out of spec replies ... */ - if (!p->clk->rate_discrete && + if (!p->clkd->rate_discrete && (st->num_returned !=3D 3 || st->num_remaining !=3D 0)) { dev_warn(p->dev, "Out-of-spec CLOCK_DESCRIBE_RATES reply for %s - returned:%d remaining= :%d rx_len:%zd\n", - p->clk->name, st->num_returned, st->num_remaining, + p->clkd->info.name, st->num_returned, st->num_remaining, st->rx_len); =20 SCMI_QUIRK(clock_rates_triplet_out_of_spec, @@ -479,38 +488,19 @@ iter_clk_describe_process_response(const struct scmi_= protocol_handle *ph, const void *response, struct scmi_iterator_state *st, void *priv) { - int ret =3D 0; struct scmi_clk_ipriv *p =3D priv; const struct scmi_msg_resp_clock_describe_rates *r =3D response; =20 - if (!p->clk->rate_discrete) { - switch (st->desc_index + st->loop_idx) { - case 0: - p->clk->range.min_rate =3D RATE_TO_U64(r->rate[0]); - break; - case 1: - p->clk->range.max_rate =3D RATE_TO_U64(r->rate[1]); - break; - case 2: - p->clk->range.step_size =3D RATE_TO_U64(r->rate[2]); - break; - default: - ret =3D -EINVAL; - break; - } - } else { - u64 *rate =3D &p->clk->list.rates[st->desc_index + st->loop_idx]; + p->clkd->rates[st->desc_index + st->loop_idx] =3D + RATE_TO_U64(r->rate[st->loop_idx]); + p->clkd->num_rates++; =20 - *rate =3D RATE_TO_U64(r->rate[st->loop_idx]); - p->clk->list.num_rates++; - } - - return ret; + return 0; } =20 static int scmi_clock_describe_rates_get(const struct scmi_protocol_handle *ph, u32 c= lk_id, - struct scmi_clock_info *clk) + struct clock_info *cinfo) { int ret; void *iter; @@ -519,9 +509,9 @@ scmi_clock_describe_rates_get(const struct scmi_protoco= l_handle *ph, u32 clk_id, .update_state =3D iter_clk_describe_update_state, .process_response =3D iter_clk_describe_process_response, }; + struct scmi_clock_desc *clkd =3D &cinfo->clkds[clk_id]; struct scmi_clk_ipriv cpriv =3D { - .clk_id =3D clk_id, - .clk =3D clk, + .clkd =3D clkd, .dev =3D ph->dev, }; =20 @@ -536,16 +526,23 @@ scmi_clock_describe_rates_get(const struct scmi_proto= col_handle *ph, u32 clk_id, if (ret) return ret; =20 - if (!clk->rate_discrete) { + /* empty set ? */ + if (!clkd->num_rates) + return 0; + + if (!clkd->rate_discrete) { + clkd->info.max_rate =3D clkd->rates[RATE_MAX]; dev_dbg(ph->dev, "Min %llu Max %llu Step %llu Hz\n", - clk->range.min_rate, clk->range.max_rate, - clk->range.step_size); - } else if (clk->list.num_rates) { - sort(clk->list.rates, clk->list.num_rates, - sizeof(clk->list.rates[0]), rate_cmp_func, NULL); + clkd->rates[RATE_MIN], clkd->rates[RATE_MAX], + clkd->rates[RATE_STEP]); + } else { + sort(clkd->rates, clkd->num_rates, + sizeof(clkd->rates[0]), rate_cmp_func, NULL); + clkd->info.max_rate =3D clkd->rates[clkd->num_rates - 1]; } + clkd->info.min_rate =3D clkd->rates[RATE_MIN]; =20 - return ret; + return 0; } =20 static int @@ -630,6 +627,7 @@ static int scmi_clock_determine_rate(const struct scmi_= protocol_handle *ph, { u64 fmin, fmax, ftmp; struct scmi_clock_info *clk; + struct scmi_clock_desc *clkd; struct clock_info *ci =3D ph->get_priv(ph); =20 if (!rate) @@ -639,15 +637,17 @@ static int scmi_clock_determine_rate(const struct scm= i_protocol_handle *ph, if (IS_ERR(clk)) return PTR_ERR(clk); =20 + clkd =3D to_desc(clk); + /* * If we can't figure out what rate it will be, so just return the * rate back to the caller. */ - if (clk->rate_discrete) + if (clkd->rate_discrete) return 0; =20 - fmin =3D clk->range.min_rate; - fmax =3D clk->range.max_rate; + fmin =3D clk->min_rate; + fmax =3D clk->max_rate; if (*rate <=3D fmin) { *rate =3D fmin; return 0; @@ -657,10 +657,10 @@ static int scmi_clock_determine_rate(const struct scm= i_protocol_handle *ph, } =20 ftmp =3D *rate - fmin; - ftmp +=3D clk->range.step_size - 1; /* to round up */ - ftmp =3D div64_ul(ftmp, clk->range.step_size); + ftmp +=3D clkd->rates[RATE_STEP] - 1; /* to round up */ + ftmp =3D div64_ul(ftmp, clkd->rates[RATE_STEP]); =20 - *rate =3D ftmp * clk->range.step_size + fmin; + *rate =3D ftmp * clkd->rates[RATE_STEP] + fmin; =20 return 0; } @@ -1122,17 +1122,16 @@ static int scmi_clock_protocol_init(const struct sc= mi_protocol_handle *ph) if (ret) return ret; =20 - cinfo->clk =3D devm_kcalloc(ph->dev, cinfo->num_clocks, - sizeof(*cinfo->clk), GFP_KERNEL); - if (!cinfo->clk) + cinfo->clkds =3D devm_kcalloc(ph->dev, cinfo->num_clocks, + sizeof(*cinfo->clkds), GFP_KERNEL); + if (!cinfo->clkds) return -ENOMEM; =20 for (clkid =3D 0; clkid < cinfo->num_clocks; clkid++) { - struct scmi_clock_info *clk =3D cinfo->clk + clkid; - + cinfo->clkds[clkid].id =3D clkid; ret =3D scmi_clock_attributes_get(ph, clkid, cinfo); if (!ret) - scmi_clock_describe_rates_get(ph, clkid, clk); + scmi_clock_describe_rates_get(ph, clkid, cinfo); } =20 if (PROTOCOL_REV_MAJOR(ph->version) >=3D 0x3) { diff --git a/include/linux/scmi_protocol.h b/include/linux/scmi_protocol.h index 28579c145045..7283302b0c85 100644 --- a/include/linux/scmi_protocol.h +++ b/include/linux/scmi_protocol.h @@ -51,6 +51,8 @@ struct scmi_clock_info { bool rate_ctrl_forbidden; bool parent_ctrl_forbidden; bool extended_config; + u64 min_rate; + u64 max_rate; union { struct { int num_rates; --=20 2.53.0