Commit 36aace15 authored by Li Ming's avatar Li Ming Committed by Dave Jiang
Browse files

cxl/pci: Drop the parameter is_port of cxl_gpf_get_dvsec() 



The first parameter of cxl_gpf_get_dvsec() is a struct device, can be
used to distinguish if the device is a cxl dport or a cxl pci device by
checking the PCIe type of it, so the parameter is_port is unnecessary
to cxl_gpf_get_dvsec(), using parameter struct device is enough.

Signed-off-by: default avatarLi Ming <ming.li@zohomail.com>
Reviewed-by: default avatarDavidlohr Bueso <dave@stgolabs.net>
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: default avatarDan Williams <dan.j.williams@intel.com>
Tested-by: default avatarDavidlohr Bueso <dave@stgolabs.net>
Link: https://patch.msgid.link/20250323093110.233040-4-ming.li@zohomail.com


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

drivers/cxl/core/pci.c

+9 −3
Original line number Diff line number Diff line
@@ -1072,14 +1072,20 @@ int cxl_pci_get_bandwidth(struct pci_dev *pdev, struct access_coordinate *c) 
#define GPF_TIMEOUT_BASE_MAX 2

#define GPF_TIMEOUT_SCALE_MAX 7 /* 10 seconds */



u16 cxl_gpf_get_dvsec(struct device *dev, bool is_port)

u16 cxl_gpf_get_dvsec(struct device *dev)

{

	struct pci_dev *pdev;

	bool is_port = true;

	u16 dvsec;



	if (!dev_is_pci(dev))

		return 0;



	dvsec = pci_find_dvsec_capability(to_pci_dev(dev), PCI_VENDOR_ID_CXL,

	pdev = to_pci_dev(dev);

	if (pci_pcie_type(pdev) == PCI_EXP_TYPE_ENDPOINT)

		is_port = false;



	dvsec = pci_find_dvsec_capability(pdev, PCI_VENDOR_ID_CXL,

			is_port ? CXL_DVSEC_PORT_GPF : CXL_DVSEC_DEVICE_GPF);

	if (!dvsec)

		dev_warn(dev, "%s GPF DVSEC not present\n",
@@ -1137,7 +1143,7 @@ int cxl_gpf_port_setup(struct cxl_dport *dport) 
		struct pci_dev *pdev;

		int dvsec;



		dvsec = cxl_gpf_get_dvsec(dport->dport_dev, true);

		dvsec = cxl_gpf_get_dvsec(dport->dport_dev);

		if (!dvsec)

			return -EINVAL;

drivers/cxl/cxl.h

+1 −1
Original line number Diff line number Diff line
@@ -910,6 +910,6 @@ bool cxl_endpoint_decoder_reset_detected(struct cxl_port *port); 
#define __mock static

#endif



u16 cxl_gpf_get_dvsec(struct device *dev, bool is_port);

u16 cxl_gpf_get_dvsec(struct device *dev);



#endif /* __CXL_H__ */

drivers/cxl/pmem.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static void cxl_nvdimm_arm_dirty_shutdown_tracking(struct cxl_nvdimm *cxl_nvd) 
		return;

	}



	if (!cxl_gpf_get_dvsec(cxlds->dev, false))

	if (!cxl_gpf_get_dvsec(cxlds->dev))

		return;



	if (cxl_get_dirty_count(mds, &count)) {