| Message ID | 166663045135.483782.14419343939744575817.stgit@djiang5-desk3.ch.intel.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2] cxl: update names for interleave granularity conversion macros | expand |
On 10/24/2022 9:54 AM, Dave Jiang wrote: > Change names for granularity macros to clearly indicate which > variable is encoded and which is the actual granularity. > > granularity == interleave granularity > eig == encoded interleave granularity > > Signed-off-by: Dave Jiang <dave.jiang@intel.com> > --- > > v2: > - Change enig to eig. (Jonathan, Dan) Sigh. This should be v3. And I need to pick up Jonathan's review tags that I didn't see. Will send fixed. > > 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..9434f8333287 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 = eig_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..a04ce9e6e186 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_eig(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 = eig_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..df294a6fd2c9 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_eig(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_eig(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 = eig_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..dacb1d769dae 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 eig_to_granularity(u16 eig, unsigned int *granularity) > { > - if (ig > 6) > + if (eig > 6) > return -EINVAL; > - *val = 256 << ig; > + *granularity = 256 << eig; > 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_eig(int granularity, u16 *eig) > { > - 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; > + *eig = ilog2(granularity) - 8; > return 0; > } > > >
diff --git a/drivers/cxl/acpi.c b/drivers/cxl/acpi.c index fb649683dd3a..9434f8333287 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 = eig_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..a04ce9e6e186 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_eig(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 = eig_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..df294a6fd2c9 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_eig(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_eig(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 = eig_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..dacb1d769dae 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 eig_to_granularity(u16 eig, unsigned int *granularity) { - if (ig > 6) + if (eig > 6) return -EINVAL; - *val = 256 << ig; + *granularity = 256 << eig; 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_eig(int granularity, u16 *eig) { - 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; + *eig = ilog2(granularity) - 8; return 0; }
Change names for granularity macros to clearly indicate which variable is encoded and which is the actual granularity. granularity == interleave granularity eig == encoded interleave granularity Signed-off-by: Dave Jiang <dave.jiang@intel.com> --- v2: - Change enig to eig. (Jonathan, Dan) 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(-)