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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B7449C433FE for ; Thu, 13 Oct 2022 12:21:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229646AbiJMMVm (ORCPT ); Thu, 13 Oct 2022 08:21:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229615AbiJMMVl (ORCPT ); Thu, 13 Oct 2022 08:21:41 -0400 Received: from frasgout.his.huawei.com (frasgout.his.huawei.com [185.176.79.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B68FC118749 for ; Thu, 13 Oct 2022 05:21:39 -0700 (PDT) Received: from fraeml736-chm.china.huawei.com (unknown [172.18.147.207]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4Mp7rK64MWz6H7RM; Thu, 13 Oct 2022 20:20:01 +0800 (CST) Received: from lhrpeml500005.china.huawei.com (7.191.163.240) by fraeml736-chm.china.huawei.com (10.206.15.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 13 Oct 2022 14:21:37 +0200 Received: from localhost (10.202.226.42) by lhrpeml500005.china.huawei.com (7.191.163.240) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 13 Oct 2022 13:21:36 +0100 Date: Thu, 13 Oct 2022 13:21:35 +0100 From: Jonathan Cameron To: Dave Jiang CC: , , , , Subject: Re: [PATCH v2] cxl: update names for interleave granularity conversion macros Message-ID: <20221013132135.000054cd@huawei.com> In-Reply-To: <166559536239.2130185.18009064249679668239.stgit@djiang5-desk3.ch.intel.com> References: <166559536239.2130185.18009064249679668239.stgit@djiang5-desk3.ch.intel.com> X-Mailer: Claws Mail 4.0.0 (GTK+ 3.24.29; i686-w64-mingw32) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.202.226.42] X-ClientProxiedBy: lhrpeml500006.china.huawei.com (7.191.161.198) To lhrpeml500005.china.huawei.com (7.191.163.240) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-cxl@vger.kernel.org On Wed, 12 Oct 2022 10:23:23 -0700 Dave Jiang wrote: > Change names for granularity macros to clearly indicate which > variable is encoded and which is the actual granularity. > > granularity == interleave granularity > enig == encoded interleave granularity I'm not that bothered, but just wanted to note we have uses of eig for this already. Maybe better to pick either enig or eig throughout ? Either way it's an improvement ;) > > Signed-off-by: Dave Jiang Reviewed-by: Jonathan Cameron > --- > > v2: > - change ig to granularity for better clarificiation (Alison) > > drivers/cxl/acpi.c | 2 +- > drivers/cxl/core/hdm.c | 6 +++--- > drivers/cxl/core/region.c | 6 +++--- > drivers/cxl/cxl.h | 12 ++++++------ > 4 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/drivers/cxl/acpi.c b/drivers/cxl/acpi.c > index fb649683dd3a..5664411c3198 100644 > --- a/drivers/cxl/acpi.c > +++ b/drivers/cxl/acpi.c > @@ -105,7 +105,7 @@ static int cxl_parse_cfmws(union acpi_subtable_headers *header, void *arg, > rc = cxl_to_ways(cfmws->interleave_ways, &ways); > if (rc) > return rc; > - rc = cxl_to_granularity(cfmws->granularity, &ig); > + rc = enig_to_granularity(cfmws->granularity, &ig); > if (rc) > return rc; > for (i = 0; i < ways; i++) > diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c > index d1d2caea5c62..626cb7d66194 100644 > --- a/drivers/cxl/core/hdm.c > +++ b/drivers/cxl/core/hdm.c > @@ -492,7 +492,7 @@ static void cxld_set_interleave(struct cxl_decoder *cxld, u32 *ctrl) > if (WARN_ONCE(ways_to_cxl(cxld->interleave_ways, &eiw), > "invalid interleave_ways: %d\n", cxld->interleave_ways)) > return; > - if (WARN_ONCE(granularity_to_cxl(cxld->interleave_granularity, &eig), > + if (WARN_ONCE(granularity_to_enig(cxld->interleave_granularity, &eig), > "invalid interleave_granularity: %d\n", > cxld->interleave_granularity)) > return; > @@ -744,8 +744,8 @@ static int init_hdm_decoder(struct cxl_port *port, struct cxl_decoder *cxld, > port->id, cxld->id, ctrl); > return rc; > } > - rc = cxl_to_granularity(FIELD_GET(CXL_HDM_DECODER0_CTRL_IG_MASK, ctrl), > - &cxld->interleave_granularity); > + rc = enig_to_granularity(FIELD_GET(CXL_HDM_DECODER0_CTRL_IG_MASK, ctrl), > + &cxld->interleave_granularity); > if (rc) > return rc; > > diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c > index 401148016978..34590f961740 100644 > --- a/drivers/cxl/core/region.c > +++ b/drivers/cxl/core/region.c > @@ -390,7 +390,7 @@ static ssize_t interleave_granularity_store(struct device *dev, > if (rc) > return rc; > > - rc = granularity_to_cxl(val, &ig); > + rc = granularity_to_enig(val, &ig); > if (rc) > return rc; > > @@ -1002,7 +1002,7 @@ static int cxl_port_setup_targets(struct cxl_port *port, > parent_iw = parent_cxld->interleave_ways; > } > > - rc = granularity_to_cxl(parent_ig, &peig); > + rc = granularity_to_enig(parent_ig, &peig); > if (rc) { > dev_dbg(&cxlr->dev, "%s:%s: invalid parent granularity: %d\n", > dev_name(parent_port->uport), > @@ -1039,7 +1039,7 @@ static int cxl_port_setup_targets(struct cxl_port *port, > eig = peig; > } > > - rc = cxl_to_granularity(eig, &ig); > + rc = enig_to_granularity(eig, &ig); > if (rc) { > dev_dbg(&cxlr->dev, "%s:%s: invalid interleave: %d\n", > dev_name(port->uport), dev_name(&port->dev), > diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h > index f680450f0b16..ef6cc63c06ef 100644 > --- a/drivers/cxl/cxl.h > +++ b/drivers/cxl/cxl.h > @@ -69,11 +69,11 @@ static inline int cxl_hdm_decoder_count(u32 cap_hdr) > } > > /* Encode defined in CXL 2.0 8.2.5.12.7 HDM Decoder Control Register */ > -static inline int cxl_to_granularity(u16 ig, unsigned int *val) > +static inline int enig_to_granularity(u16 enig, unsigned int *granularity) > { > - if (ig > 6) > + if (enig > 6) > return -EINVAL; > - *val = 256 << ig; > + *granularity = 256 << enig; > return 0; > } > > @@ -94,11 +94,11 @@ static inline int cxl_to_ways(u8 eniw, unsigned int *val) > return 0; > } > > -static inline int granularity_to_cxl(int g, u16 *ig) > +static inline int granularity_to_enig(int granularity, u16 *enig) > { > - if (g > SZ_16K || g < 256 || !is_power_of_2(g)) > + if (granularity > SZ_16K || granularity < 256 || !is_power_of_2(granularity)) > return -EINVAL; > - *ig = ilog2(g) - 8; > + *enig = ilog2(granularity) - 8; > return 0; > } > > >