Commit 8358e8f1 authored by Dave Jiang's avatar Dave Jiang Committed by Dan Williams
Browse files

cxl: Add support for reading CXL switch CDAT table 



Add read_cdat_data() call in cxl_switch_port_probe() to allow
reading of CDAT data for CXL switches. read_cdat_data() needs
to be adjusted for the retrieving of the PCIe device depending
on if the passed in port is endpoint or switch.

Reviewed-by: default avatarDavidlohr Bueso <dave@stgolabs.net>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
Link: https://lore.kernel.org/r/169713682855.2205276.6418370379144967443.stgit@djiang5-mobl3


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

drivers/cxl/core/pci.c

+17 −5
Original line number Diff line number Diff line
@@ -613,18 +613,30 @@ static unsigned char cdat_checksum(void *buf, size_t size) 
 */

void read_cdat_data(struct cxl_port *port)

{

	struct cxl_memdev *cxlmd = to_cxl_memdev(port->uport_dev);

	struct device *host = cxlmd->dev.parent;

	struct device *uport = port->uport_dev;

	struct device *dev = &port->dev;

	struct pci_doe_mb *cdat_doe;

	struct pci_dev *pdev = NULL;

	struct cxl_memdev *cxlmd;

	size_t cdat_length;

	void *cdat_table;

	int rc;



	if (!dev_is_pci(host))

	if (is_cxl_memdev(uport)) {

		struct device *host;



		cxlmd = to_cxl_memdev(uport);

		host = cxlmd->dev.parent;

		if (dev_is_pci(host))

			pdev = to_pci_dev(host);

	} else if (dev_is_pci(uport)) {

		pdev = to_pci_dev(uport);

	}



	if (!pdev)

		return;

	cdat_doe = pci_find_doe_mailbox(to_pci_dev(host),

					PCI_DVSEC_VENDOR_ID_CXL,



	cdat_doe = pci_find_doe_mailbox(pdev, PCI_DVSEC_VENDOR_ID_CXL,

					CXL_DOE_PROTOCOL_TABLE_ACCESS);

	if (!cdat_doe) {

		dev_dbg(dev, "No CDAT mailbox\n");

drivers/cxl/port.c

+3 −0
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ static int cxl_switch_port_probe(struct cxl_port *port) 
	struct cxl_hdm *cxlhdm;

	int rc;



	/* Cache the data early to ensure is_visible() works */

	read_cdat_data(port);



	rc = devm_cxl_port_enumerate_dports(port);

	if (rc < 0)

		return rc;