| Message ID | 165603872867.551046.2170426227407458814.stgit@dwillia2-xfh |
|---|---|
| State | Superseded |
| Headers | show |
| Series | CXL PMEM Region Provisioning | expand |
On Thu, Jun 23, 2022 at 07:45:28PM -0700, Dan Williams wrote: > In preparation for growing a ->dpa_range attribute for endpoint > decoders, rename the current ->decoder_range to the more descriptive > ->hpa_range. > > Signed-off-by: Dan Williams <dan.j.williams@intel.com> Reviewed-by: Alison Schofield <alison.schofield@intel.com> > --- > drivers/cxl/core/hdm.c | 2 +- > drivers/cxl/core/port.c | 4 ++-- > drivers/cxl/cxl.h | 4 ++-- > tools/testing/cxl/test/cxl.c | 2 +- > 4 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c > index ba3d2d959c71..5c070c93b07f 100644 > --- a/drivers/cxl/core/hdm.c > +++ b/drivers/cxl/core/hdm.c > @@ -172,7 +172,7 @@ static int init_hdm_decoder(struct cxl_port *port, struct cxl_decoder *cxld, > return -ENXIO; > } > > - cxld->decoder_range = (struct range) { > + cxld->hpa_range = (struct range) { > .start = base, > .end = base + size - 1, > }; > diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c > index 7810d1a8369b..98bcbbd59a75 100644 > --- a/drivers/cxl/core/port.c > +++ b/drivers/cxl/core/port.c > @@ -78,7 +78,7 @@ static ssize_t start_show(struct device *dev, struct device_attribute *attr, > if (is_root_decoder(dev)) > start = cxld->platform_res.start; > else > - start = cxld->decoder_range.start; > + start = cxld->hpa_range.start; > > return sysfs_emit(buf, "%#llx\n", start); > } > @@ -93,7 +93,7 @@ static ssize_t size_show(struct device *dev, struct device_attribute *attr, > if (is_root_decoder(dev)) > size = resource_size(&cxld->platform_res); > else > - size = range_len(&cxld->decoder_range); > + size = range_len(&cxld->hpa_range); > > return sysfs_emit(buf, "%#llx\n", size); > } > diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h > index 6799b27c7db2..8256728cea8d 100644 > --- a/drivers/cxl/cxl.h > +++ b/drivers/cxl/cxl.h > @@ -198,7 +198,7 @@ enum cxl_decoder_type { > * @dev: this decoder's device > * @id: kernel device name id > * @platform_res: address space resources considered by root decoder > - * @decoder_range: address space resources considered by midlevel decoder > + * @hpa_range: Host physical address range mapped by this decoder > * @interleave_ways: number of cxl_dports in this decode > * @interleave_granularity: data stride per dport > * @target_type: accelerator vs expander (type2 vs type3) selector > @@ -212,7 +212,7 @@ struct cxl_decoder { > int id; > union { > struct resource platform_res; > - struct range decoder_range; > + struct range hpa_range; > }; > int interleave_ways; > int interleave_granularity; > diff --git a/tools/testing/cxl/test/cxl.c b/tools/testing/cxl/test/cxl.c > index 431f2bddf6c8..7a08b025f2de 100644 > --- a/tools/testing/cxl/test/cxl.c > +++ b/tools/testing/cxl/test/cxl.c > @@ -461,7 +461,7 @@ static int mock_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm) > return PTR_ERR(cxld); > } > > - cxld->decoder_range = (struct range) { > + cxld->hpa_range = (struct range) { > .start = 0, > .end = -1, > }; >
On Thu, 23 Jun 2022 19:45:28 -0700 Dan Williams <dan.j.williams@intel.com> wrote: > In preparation for growing a ->dpa_range attribute for endpoint > decoders, rename the current ->decoder_range to the more descriptive > ->hpa_range. > > Signed-off-by: Dan Williams <dan.j.williams@intel.com> Make sense Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > drivers/cxl/core/hdm.c | 2 +- > drivers/cxl/core/port.c | 4 ++-- > drivers/cxl/cxl.h | 4 ++-- > tools/testing/cxl/test/cxl.c | 2 +- > 4 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c > index ba3d2d959c71..5c070c93b07f 100644 > --- a/drivers/cxl/core/hdm.c > +++ b/drivers/cxl/core/hdm.c > @@ -172,7 +172,7 @@ static int init_hdm_decoder(struct cxl_port *port, struct cxl_decoder *cxld, > return -ENXIO; > } > > - cxld->decoder_range = (struct range) { > + cxld->hpa_range = (struct range) { > .start = base, > .end = base + size - 1, > }; > diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c > index 7810d1a8369b..98bcbbd59a75 100644 > --- a/drivers/cxl/core/port.c > +++ b/drivers/cxl/core/port.c > @@ -78,7 +78,7 @@ static ssize_t start_show(struct device *dev, struct device_attribute *attr, > if (is_root_decoder(dev)) > start = cxld->platform_res.start; > else > - start = cxld->decoder_range.start; > + start = cxld->hpa_range.start; > > return sysfs_emit(buf, "%#llx\n", start); > } > @@ -93,7 +93,7 @@ static ssize_t size_show(struct device *dev, struct device_attribute *attr, > if (is_root_decoder(dev)) > size = resource_size(&cxld->platform_res); > else > - size = range_len(&cxld->decoder_range); > + size = range_len(&cxld->hpa_range); > > return sysfs_emit(buf, "%#llx\n", size); > } > diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h > index 6799b27c7db2..8256728cea8d 100644 > --- a/drivers/cxl/cxl.h > +++ b/drivers/cxl/cxl.h > @@ -198,7 +198,7 @@ enum cxl_decoder_type { > * @dev: this decoder's device > * @id: kernel device name id > * @platform_res: address space resources considered by root decoder > - * @decoder_range: address space resources considered by midlevel decoder > + * @hpa_range: Host physical address range mapped by this decoder > * @interleave_ways: number of cxl_dports in this decode > * @interleave_granularity: data stride per dport > * @target_type: accelerator vs expander (type2 vs type3) selector > @@ -212,7 +212,7 @@ struct cxl_decoder { > int id; > union { > struct resource platform_res; > - struct range decoder_range; > + struct range hpa_range; > }; > int interleave_ways; > int interleave_granularity; > diff --git a/tools/testing/cxl/test/cxl.c b/tools/testing/cxl/test/cxl.c > index 431f2bddf6c8..7a08b025f2de 100644 > --- a/tools/testing/cxl/test/cxl.c > +++ b/tools/testing/cxl/test/cxl.c > @@ -461,7 +461,7 @@ static int mock_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm) > return PTR_ERR(cxld); > } > > - cxld->decoder_range = (struct range) { > + cxld->hpa_range = (struct range) { > .start = 0, > .end = -1, > }; >
On Thu, Jun 23, 2022 at 07:45:28PM -0700, Dan Williams wrote: > In preparation for growing a ->dpa_range attribute for endpoint > decoders, rename the current ->decoder_range to the more descriptive > ->hpa_range. > > Signed-off-by: Dan Williams <dan.j.williams@intel.com> > --- > drivers/cxl/core/hdm.c | 2 +- > drivers/cxl/core/port.c | 4 ++-- > drivers/cxl/cxl.h | 4 ++-- > tools/testing/cxl/test/cxl.c | 2 +- > 4 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c > index ba3d2d959c71..5c070c93b07f 100644 > --- a/drivers/cxl/core/hdm.c > +++ b/drivers/cxl/core/hdm.c > @@ -172,7 +172,7 @@ static int init_hdm_decoder(struct cxl_port *port, struct cxl_decoder *cxld, > return -ENXIO; > } > > - cxld->decoder_range = (struct range) { > + cxld->hpa_range = (struct range) { > .start = base, > .end = base + size - 1, > }; > diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c > index 7810d1a8369b..98bcbbd59a75 100644 > --- a/drivers/cxl/core/port.c > +++ b/drivers/cxl/core/port.c > @@ -78,7 +78,7 @@ static ssize_t start_show(struct device *dev, struct device_attribute *attr, > if (is_root_decoder(dev)) > start = cxld->platform_res.start; > else > - start = cxld->decoder_range.start; > + start = cxld->hpa_range.start; > > return sysfs_emit(buf, "%#llx\n", start); > } > @@ -93,7 +93,7 @@ static ssize_t size_show(struct device *dev, struct device_attribute *attr, > if (is_root_decoder(dev)) > size = resource_size(&cxld->platform_res); > else > - size = range_len(&cxld->decoder_range); > + size = range_len(&cxld->hpa_range); > > return sysfs_emit(buf, "%#llx\n", size); > } > diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h > index 6799b27c7db2..8256728cea8d 100644 > --- a/drivers/cxl/cxl.h > +++ b/drivers/cxl/cxl.h > @@ -198,7 +198,7 @@ enum cxl_decoder_type { > * @dev: this decoder's device > * @id: kernel device name id > * @platform_res: address space resources considered by root decoder > - * @decoder_range: address space resources considered by midlevel decoder > + * @hpa_range: Host physical address range mapped by this decoder > * @interleave_ways: number of cxl_dports in this decode > * @interleave_granularity: data stride per dport > * @target_type: accelerator vs expander (type2 vs type3) selector > @@ -212,7 +212,7 @@ struct cxl_decoder { > int id; > union { > struct resource platform_res; > - struct range decoder_range; > + struct range hpa_range; > }; > int interleave_ways; > int interleave_granularity; > diff --git a/tools/testing/cxl/test/cxl.c b/tools/testing/cxl/test/cxl.c > index 431f2bddf6c8..7a08b025f2de 100644 > --- a/tools/testing/cxl/test/cxl.c > +++ b/tools/testing/cxl/test/cxl.c > @@ -461,7 +461,7 @@ static int mock_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm) > return PTR_ERR(cxld); > } > > - cxld->decoder_range = (struct range) { > + cxld->hpa_range = (struct range) { > .start = 0, > .end = -1, > }; > > Looks good. Reviewed by: Adam Manzanares <a.manzanares@samsung.com>
diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c index ba3d2d959c71..5c070c93b07f 100644 --- a/drivers/cxl/core/hdm.c +++ b/drivers/cxl/core/hdm.c @@ -172,7 +172,7 @@ static int init_hdm_decoder(struct cxl_port *port, struct cxl_decoder *cxld, return -ENXIO; } - cxld->decoder_range = (struct range) { + cxld->hpa_range = (struct range) { .start = base, .end = base + size - 1, }; diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index 7810d1a8369b..98bcbbd59a75 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -78,7 +78,7 @@ static ssize_t start_show(struct device *dev, struct device_attribute *attr, if (is_root_decoder(dev)) start = cxld->platform_res.start; else - start = cxld->decoder_range.start; + start = cxld->hpa_range.start; return sysfs_emit(buf, "%#llx\n", start); } @@ -93,7 +93,7 @@ static ssize_t size_show(struct device *dev, struct device_attribute *attr, if (is_root_decoder(dev)) size = resource_size(&cxld->platform_res); else - size = range_len(&cxld->decoder_range); + size = range_len(&cxld->hpa_range); return sysfs_emit(buf, "%#llx\n", size); } diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index 6799b27c7db2..8256728cea8d 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -198,7 +198,7 @@ enum cxl_decoder_type { * @dev: this decoder's device * @id: kernel device name id * @platform_res: address space resources considered by root decoder - * @decoder_range: address space resources considered by midlevel decoder + * @hpa_range: Host physical address range mapped by this decoder * @interleave_ways: number of cxl_dports in this decode * @interleave_granularity: data stride per dport * @target_type: accelerator vs expander (type2 vs type3) selector @@ -212,7 +212,7 @@ struct cxl_decoder { int id; union { struct resource platform_res; - struct range decoder_range; + struct range hpa_range; }; int interleave_ways; int interleave_granularity; diff --git a/tools/testing/cxl/test/cxl.c b/tools/testing/cxl/test/cxl.c index 431f2bddf6c8..7a08b025f2de 100644 --- a/tools/testing/cxl/test/cxl.c +++ b/tools/testing/cxl/test/cxl.c @@ -461,7 +461,7 @@ static int mock_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm) return PTR_ERR(cxld); } - cxld->decoder_range = (struct range) { + cxld->hpa_range = (struct range) { .start = 0, .end = -1, };
In preparation for growing a ->dpa_range attribute for endpoint decoders, rename the current ->decoder_range to the more descriptive ->hpa_range. Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- drivers/cxl/core/hdm.c | 2 +- drivers/cxl/core/port.c | 4 ++-- drivers/cxl/cxl.h | 4 ++-- tools/testing/cxl/test/cxl.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)