Commit f611d98a authored by Robert Richter's avatar Robert Richter Committed by Dan Williams
Browse files

cxl/pci: Remove Component Register base address from struct cxl_dev_state 



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: default avatarTerry Bowman <terry.bowman@amd.com>
Signed-off-by: default avatarRobert Richter <rrichter@amd.com>
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: default avatarDave Jiang <dave.jiang@intel.com>
Link: https://lore.kernel.org/r/20231018171713.1883517-9-rrichter@amd.com


Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 8ce520fd

drivers/cxl/cxlmem.h

+0 −2
Original line number Diff line number Diff line
@@ -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;

};

drivers/cxl/pci.c

+0 −3
Original line number Diff line number Diff line
@@ -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)

tools/testing/cxl/test/mem.c

+1 −3
Original line number Diff line number Diff line
@@ -1421,10 +1421,8 @@ static int cxl_mock_mem_probe(struct platform_device *pdev) 


	cxlds = &mds->cxlds;

	cxlds->serial = pdev->id;

	if (is_rcd(pdev)) {

	if (is_rcd(pdev))

		cxlds->rcd = true;

		cxlds->component_reg_phys = CXL_RESOURCE_NONE;

	}



	rc = cxl_enumerate_cmds(mds);

	if (rc)