cxl/core: Rename ->decoder_range ->hpa_range

In preparation for growing a ->dpa_range attribute for endpoint
decoders, rename the current ->decoder_range to the more descriptive
->hpa_range.

Reviewed-by: Alison Schofield <alison.schofield@intel.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Adam Manzanares <a.manzanares@samsung.com>
Link: https://lore.kernel.org/r/165603872867.551046.2170426227407458814.stgit@dwillia2-xfh
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c
index ba3d2d959c717e6ff933cb8651c95179fd75d8b6..5c070c93b07f45f01c1a045cab0f22953b3bb6f4 100644 (file)
--- 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 7810d1a8369bbe55802ab9ff9930e6e6b315e51b..98bcbbd59a7576aef01016f8ef1bdaf858ebfb8a 100644 (file)
--- 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 6799b27c7db20c02cf97eccb9eae4c3ddfe64f74..8256728cea8da2dbb27fe807f60faf9a993d5643 100644 (file)
--- 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 431f2bddf6c834652d6cf5f75f12886cd1c6b986..7a08b025f2dec598801c024ff7a8dc579db12653 100644 (file)
--- 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,
                };