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: Li Ming <ming.li@zohomail.com>
Reviewed-by: Davidlohr Bueso <dave@stgolabs.net>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Tested-by: Davidlohr Bueso <dave@stgolabs.net>
Link: https://patch.msgid.link/20250323093110.233040-4-ming.li@zohomail.com
Signed-off-by: Dave Jiang <dave.jiang@intel.com>

diff --git a/drivers/cxl/core/pci.c b/drivers/cxl/core/pci.c
index edbdaf1681e8c8aacff290db24afa0fdfaa1f127..3b80e9a76ba862c25d1387d168e2fb3d3cfb16c7 100644 (file)
--- a/drivers/cxl/core/pci.c
+++ b/drivers/cxl/core/pci.c
@@ -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;
 

diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h
index 2d81ccd83916d674340b75c1a854d630a1aa5afa..a9ab46eb0610012f268d482df006122d5d984239 100644 (file)
--- a/drivers/cxl/cxl.h
+++ b/drivers/cxl/cxl.h
@@ -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__ */

diff --git a/drivers/cxl/pmem.c b/drivers/cxl/pmem.c
index d061fe3d2b86628a537389fb948efd1c6705ef28..e197883690efc11f60c31bd56aeb5695665d422b 100644 (file)
--- a/drivers/cxl/pmem.c
+++ b/drivers/cxl/pmem.c
@@ -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)) {