Commit 2f84d072 authored by Alejandro Lucero's avatar Alejandro Lucero Committed by Dave Jiang
Browse files

cxl/pci: Add CXL Type 1/2 support to cxl_dvsec_rr_decode() 



In cxl_dvsec_rr_decode() the pci driver expects to retrieve a cxlds,
struct cxl_dev_state, from the driver_data field of struct device.
While that works for Type 3, drivers for Type 1/2 devices may not
put a cxlds in the driver_data field.

In preparation for supporting Type 1/2 devices, replace parameter
'struct device' with 'struct cxl_dev_state' in cxl_dvsec_rr_decode().

Remove the unused parameter 'cxl_port' in cxl_dvsec_rr_decode().

Signed-off-by: default avatarAlejandro Lucero <alucerop@amd.com>
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: default avatarAlison Schofield <alison.schofield@intel.com>
Link: https://patch.msgid.link/20241203162112.5088-1-alucerop@amd.com


Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
parent c8e88de1

drivers/cxl/core/pci.c

+3 −3
Original line number Diff line number Diff line
@@ -291,11 +291,11 @@ static int devm_cxl_enable_hdm(struct device *host, struct cxl_hdm *cxlhdm) 
	return devm_add_action_or_reset(host, disable_hdm, cxlhdm);

}



int cxl_dvsec_rr_decode(struct device *dev, struct cxl_port *port,

int cxl_dvsec_rr_decode(struct cxl_dev_state *cxlds,

			struct cxl_endpoint_dvsec_info *info)

{

	struct pci_dev *pdev = to_pci_dev(dev);

	struct cxl_dev_state *cxlds = pci_get_drvdata(pdev);

	struct pci_dev *pdev = to_pci_dev(cxlds->dev);

	struct device *dev = cxlds->dev;

	int hdm_count, rc, i, ranges = 0;

	int d = cxlds->cxl_dvsec;

	u16 cap, ctrl;

drivers/cxl/cxl.h

+2 −1
Original line number Diff line number Diff line
@@ -821,7 +821,8 @@ struct cxl_hdm *devm_cxl_setup_hdm(struct cxl_port *port, 
int devm_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm,

				struct cxl_endpoint_dvsec_info *info);

int devm_cxl_add_passthrough_decoder(struct cxl_port *port);

int cxl_dvsec_rr_decode(struct device *dev, struct cxl_port *port,

struct cxl_dev_state;

int cxl_dvsec_rr_decode(struct cxl_dev_state *cxlds,

			struct cxl_endpoint_dvsec_info *info);



bool is_cxl_region(struct device *dev);

drivers/cxl/port.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static int cxl_endpoint_port_probe(struct cxl_port *port) 
	struct cxl_port *root;

	int rc;



	rc = cxl_dvsec_rr_decode(cxlds->dev, port, &info);

	rc = cxl_dvsec_rr_decode(cxlds, &info);

	if (rc < 0)

		return rc;

tools/testing/cxl/test/mock.c

+3 −3
Original line number Diff line number Diff line
@@ -228,16 +228,16 @@ int __wrap_cxl_hdm_decode_init(struct cxl_dev_state *cxlds, 
}

EXPORT_SYMBOL_NS_GPL(__wrap_cxl_hdm_decode_init, "CXL");



int __wrap_cxl_dvsec_rr_decode(struct device *dev, struct cxl_port *port,

int __wrap_cxl_dvsec_rr_decode(struct cxl_dev_state *cxlds,

			       struct cxl_endpoint_dvsec_info *info)

{

	int rc = 0, index;

	struct cxl_mock_ops *ops = get_cxl_mock_ops(&index);



	if (ops && ops->is_mock_dev(dev))

	if (ops && ops->is_mock_dev(cxlds->dev))

		rc = 0;

	else

		rc = cxl_dvsec_rr_decode(dev, port, info);

		rc = cxl_dvsec_rr_decode(cxlds, info);

	put_cxl_mock_ops(index);



	return rc;