lkml.org 
[lkml]   [2023]   [Oct]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v12 08/20] cxl/pci: Remove Component Register base address from struct cxl_dev_state
    Date
    The Component Register base address @component_reg_phys is no longer
    used after the rework of the Component Register setup which now uses
    struct member @reg_map instead. Remove the base address.

    Signed-off-by: Terry Bowman <terry.bowman@amd.com>
    Signed-off-by: Robert Richter <rrichter@amd.com>
    Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
    Reviewed-by: Dave Jiang <dave.jiang@intel.com>
    ---
    drivers/cxl/cxlmem.h | 2 --
    drivers/cxl/pci.c | 3 ---
    tools/testing/cxl/test/mem.c | 1 -
    3 files changed, 6 deletions(-)

    diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h
    index 8fb8db47c3b7..cfd287466fa8 100644
    --- a/drivers/cxl/cxlmem.h
    +++ b/drivers/cxl/cxlmem.h
    @@ -405,7 +405,6 @@ enum cxl_devtype {
    * @dpa_res: Overall DPA resource tree for the device
    * @pmem_res: Active Persistent memory capacity configuration
    * @ram_res: Active Volatile memory capacity configuration
    - * @component_reg_phys: register base of component registers
    * @serial: PCIe Device Serial Number
    * @type: Generic Memory Class device or Vendor Specific Memory device
    */
    @@ -420,7 +419,6 @@ struct cxl_dev_state {
    struct resource dpa_res;
    struct resource pmem_res;
    struct resource ram_res;
    - resource_size_t component_reg_phys;
    u64 serial;
    enum cxl_devtype type;
    };
    diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c
    index a6ad9bcb96b4..037792e941f2 100644
    --- a/drivers/cxl/pci.c
    +++ b/drivers/cxl/pci.c
    @@ -834,7 +834,6 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
    * If the component registers can't be found, the cxl_pci driver may
    * still be useful for management functions so don't return an error.
    */
    - cxlds->component_reg_phys = CXL_RESOURCE_NONE;
    rc = cxl_pci_setup_regs(pdev, CXL_REGLOC_RBI_COMPONENT,
    &cxlds->reg_map);
    if (rc)
    @@ -842,8 +841,6 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
    else if (!cxlds->reg_map.component_map.ras.valid)
    dev_dbg(&pdev->dev, "RAS registers not found\n");

    - cxlds->component_reg_phys = cxlds->reg_map.resource;
    -
    rc = cxl_map_component_regs(&cxlds->reg_map, &cxlds->regs.component,
    BIT(CXL_CM_CAP_CAP_ID_RAS));
    if (rc)
    diff --git a/tools/testing/cxl/test/mem.c b/tools/testing/cxl/test/mem.c
    index 464fc39ed277..aa44d111fd28 100644
    --- a/tools/testing/cxl/test/mem.c
    +++ b/tools/testing/cxl/test/mem.c
    @@ -1423,7 +1423,6 @@ static int cxl_mock_mem_probe(struct platform_device *pdev)
    cxlds->serial = pdev->id;
    if (is_rcd(pdev)) {
    cxlds->rcd = true;
    - cxlds->component_reg_phys = CXL_RESOURCE_NONE;
    }

    rc = cxl_enumerate_cmds(mds);
    --
    2.30.2
    \
     
     \ /
      Last update: 2023-10-18 19:32    [W:7.020 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site