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

cxl/pci: Rename DOE mailbox handle to doe_mb 



Trivial variable rename for the DOE mailbox handle from cdat_doe to
doe_mb. The variable name cdat_doe is too ambiguous, use doe_mb that
is commonly used for the mailbox.

Signed-off-by: default avatarRobert Richter <rrichter@amd.com>
Reviewed-by: default avatarDave Jiang <dave.jiang@intel.com>
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/20240216155844.406996-2-rrichter@amd.com


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

drivers/cxl/core/pci.c

+10 −10
Original line number Diff line number Diff line
@@ -518,14 +518,14 @@ EXPORT_SYMBOL_NS_GPL(cxl_hdm_decode_init, CXL); 
	 FIELD_PREP(CXL_DOE_TABLE_ACCESS_ENTRY_HANDLE, (entry_handle)))



static int cxl_cdat_get_length(struct device *dev,

			       struct pci_doe_mb *cdat_doe,

			       struct pci_doe_mb *doe_mb,

			       size_t *length)

{

	__le32 request = CDAT_DOE_REQ(0);

	__le32 response[2];

	int rc;



	rc = pci_doe(cdat_doe, PCI_DVSEC_VENDOR_ID_CXL,

	rc = pci_doe(doe_mb, PCI_DVSEC_VENDOR_ID_CXL,

		     CXL_DOE_PROTOCOL_TABLE_ACCESS,

		     &request, sizeof(request),

		     &response, sizeof(response));
@@ -543,7 +543,7 @@ static int cxl_cdat_get_length(struct device *dev, 
}



static int cxl_cdat_read_table(struct device *dev,

			       struct pci_doe_mb *cdat_doe,

			       struct pci_doe_mb *doe_mb,

			       void *cdat_table, size_t *cdat_length)

{

	size_t length = *cdat_length + sizeof(__le32);
@@ -557,7 +557,7 @@ static int cxl_cdat_read_table(struct device *dev, 
		size_t entry_dw;

		int rc;



		rc = pci_doe(cdat_doe, PCI_DVSEC_VENDOR_ID_CXL,

		rc = pci_doe(doe_mb, PCI_DVSEC_VENDOR_ID_CXL,

			     CXL_DOE_PROTOCOL_TABLE_ACCESS,

			     &request, sizeof(request),

			     data, length);
@@ -617,7 +617,7 @@ void read_cdat_data(struct cxl_port *port) 
{

	struct device *uport = port->uport_dev;

	struct device *dev = &port->dev;

	struct pci_doe_mb *cdat_doe;

	struct pci_doe_mb *doe_mb;

	struct pci_dev *pdev = NULL;

	struct cxl_memdev *cxlmd;

	size_t cdat_length;
@@ -638,16 +638,16 @@ void read_cdat_data(struct cxl_port *port) 
	if (!pdev)

		return;



	cdat_doe = pci_find_doe_mailbox(pdev, PCI_DVSEC_VENDOR_ID_CXL,

	doe_mb = pci_find_doe_mailbox(pdev, PCI_DVSEC_VENDOR_ID_CXL,

				      CXL_DOE_PROTOCOL_TABLE_ACCESS);

	if (!cdat_doe) {

	if (!doe_mb) {

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

		return;

	}



	port->cdat_available = true;



	if (cxl_cdat_get_length(dev, cdat_doe, &cdat_length)) {

	if (cxl_cdat_get_length(dev, doe_mb, &cdat_length)) {

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

		return;

	}
@@ -656,7 +656,7 @@ void read_cdat_data(struct cxl_port *port) 
	if (!cdat_buf)

		return;



	rc = cxl_cdat_read_table(dev, cdat_doe, cdat_buf, &cdat_length);

	rc = cxl_cdat_read_table(dev, doe_mb, cdat_buf, &cdat_length);

	if (rc)

		goto err;