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

cxl/mem: Prepare for early RCH dport component register setup 



In order to move the RCH dport component register setup to cxl_pci the
base address must be stored in CXL device state (cxlds) for both
modes, RCH and VH. Store it in cxlds->component_reg_phys and use it
for endpoint creation.

Signed-off-by: default avatarRobert Richter <rrichter@amd.com>
Signed-off-by: default avatarTerry Bowman <terry.bowman@amd.com>
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/20230622205523.85375-13-terry.bowman@amd.com


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

drivers/cxl/mem.c

+4 −5
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ static int devm_cxl_add_endpoint(struct device *host, struct cxl_memdev *cxlmd, 
	struct cxl_port *parent_port = parent_dport->port;

	struct cxl_dev_state *cxlds = cxlmd->cxlds;

	struct cxl_port *endpoint, *iter, *down;

	resource_size_t component_reg_phys;

	int rc;



	/*
@@ -72,11 +71,11 @@ static int devm_cxl_add_endpoint(struct device *host, struct cxl_memdev *cxlmd, 
	 * typical register locator mechanism.

	 */

	if (parent_dport->rch && cxlds->component_reg_phys == CXL_RESOURCE_NONE)

		component_reg_phys =

		cxlds->component_reg_phys =

			cxl_rcd_component_reg_phys(&cxlmd->dev, parent_dport);

	else

		component_reg_phys = cxlds->component_reg_phys;

	endpoint = devm_cxl_add_port(host, &cxlmd->dev, component_reg_phys,



	endpoint = devm_cxl_add_port(host, &cxlmd->dev,

				     cxlds->component_reg_phys,

				     parent_dport);

	if (IS_ERR(endpoint))

		return PTR_ERR(endpoint);