perf/dwc_pcie: Qualify RAS DES VSEC Capability by Vendor, Revision

PCI Vendor-Specific (VSEC) Capabilities are defined by each vendor.
Devices from different vendors may advertise a VSEC Capability with the DWC
RAS DES functionality, but the vendors may assign different VSEC IDs.

Search for the DWC RAS DES Capability using the VSEC ID and VSEC Rev
chosen by the vendor.

This does not fix a current problem because Alibaba, Ampere, and Qualcomm
all assigned the same VSEC ID and VSEC Rev for the DWC RAS DES Capability.

The potential issue is that we may add support for a device from another
vendor, where the vendor has already assigned DWC_PCIE_VSEC_RAS_DES_ID
(0x02) for an unrelated VSEC.  In that event, dwc_pcie_des_cap() would find
the unrelated VSEC and mistakenly assume it was a DWC RAS DES Capability.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-and-tested-by: Ilkka Koskinen <ilkka@os.amperecomputing.com>
Reviewed-and-tested-by: Shuai Xue <xueshuai@linux.alibaba.com>
Link: https://lore.kernel.org/r/20241209222938.3219364-1-helgaas@kernel.org
Signed-off-by: Will Deacon <will@kernel.org>

diff --git a/drivers/perf/dwc_pcie_pmu.c b/drivers/perf/dwc_pcie_pmu.c
index 890cf3bb43a22dca1d57a18c3421974524c92e4b..cccecae9823f6aa6bb98e438713a1386b7f055d9 100644 (file)
--- a/drivers/perf/dwc_pcie_pmu.c
+++ b/drivers/perf/dwc_pcie_pmu.c
@@ -20,7 +20,6 @@
 #include <linux/sysfs.h>
 #include <linux/types.h>
 
-#define DWC_PCIE_VSEC_RAS_DES_ID               0x02
 #define DWC_PCIE_EVENT_CNT_CTL                 0x8
 
 /*
@@ -100,14 +99,23 @@ struct dwc_pcie_dev_info {
        struct list_head dev_node;
 };
 
-struct dwc_pcie_vendor_id {
-       int vendor_id;
+struct dwc_pcie_pmu_vsec_id {
+       u16 vendor_id;
+       u16 vsec_id;
+       u8 vsec_rev;
 };
 
-static const struct dwc_pcie_vendor_id dwc_pcie_vendor_ids[] = {
-       {.vendor_id = PCI_VENDOR_ID_ALIBABA },
-       {.vendor_id = PCI_VENDOR_ID_AMPERE },
-       {.vendor_id = PCI_VENDOR_ID_QCOM },
+/*
+ * VSEC IDs are allocated by the vendor, so a given ID may mean different
+ * things to different vendors.  See PCIe r6.0, sec 7.9.5.2.
+ */
+static const struct dwc_pcie_pmu_vsec_id dwc_pcie_pmu_vsec_ids[] = {
+       { .vendor_id = PCI_VENDOR_ID_ALIBABA,
+         .vsec_id = 0x02, .vsec_rev = 0x4 },
+       { .vendor_id = PCI_VENDOR_ID_AMPERE,
+         .vsec_id = 0x02, .vsec_rev = 0x4 },
+       { .vendor_id = PCI_VENDOR_ID_QCOM,
+         .vsec_id = 0x02, .vsec_rev = 0x4 },
        {} /* terminator */
 };
 
@@ -519,31 +527,28 @@ static void dwc_pcie_unregister_pmu(void *data)
        perf_pmu_unregister(&pcie_pmu->pmu);
 }
 
-static bool dwc_pcie_match_des_cap(struct pci_dev *pdev)
+static u16 dwc_pcie_des_cap(struct pci_dev *pdev)
 {
-       const struct dwc_pcie_vendor_id *vid;
-       u16 vsec = 0;
+       const struct dwc_pcie_pmu_vsec_id *vid;
+       u16 vsec;
        u32 val;
 
        if (!pci_is_pcie(pdev) || !(pci_pcie_type(pdev) == PCI_EXP_TYPE_ROOT_PORT))
-               return false;
+               return 0;
 
-       for (vid = dwc_pcie_vendor_ids; vid->vendor_id; vid++) {
+       for (vid = dwc_pcie_pmu_vsec_ids; vid->vendor_id; vid++) {
                vsec = pci_find_vsec_capability(pdev, vid->vendor_id,
-                                               DWC_PCIE_VSEC_RAS_DES_ID);
-               if (vsec)
-                       break;
+                                               vid->vsec_id);
+               if (vsec) {
+                       pci_read_config_dword(pdev, vsec + PCI_VNDR_HEADER,
+                                             &val);
+                       if (PCI_VNDR_HEADER_REV(val) == vid->vsec_rev) {
+                               pci_dbg(pdev, "Detected PCIe Vendor-Specific Extended Capability RAS DES\n");
+                               return vsec;
+                       }
+               }
        }
-       if (!vsec)
-               return false;
-
-       pci_read_config_dword(pdev, vsec + PCI_VNDR_HEADER, &val);
-       if (PCI_VNDR_HEADER_REV(val) != 0x04)
-               return false;
-
-       pci_dbg(pdev,
-               "Detected PCIe Vendor-Specific Extended Capability RAS DES\n");
-       return true;
+       return 0;
 }
 
 static void dwc_pcie_unregister_dev(struct dwc_pcie_dev_info *dev_info)
@@ -587,7 +592,7 @@ static int dwc_pcie_pmu_notifier(struct notifier_block *nb,
 
        switch (action) {
        case BUS_NOTIFY_ADD_DEVICE:
-               if (!dwc_pcie_match_des_cap(pdev))
+               if (!dwc_pcie_des_cap(pdev))
                        return NOTIFY_DONE;
                if (dwc_pcie_register_dev(pdev))
                        return NOTIFY_BAD;
@@ -612,13 +617,14 @@ static int dwc_pcie_pmu_probe(struct platform_device *plat_dev)
        struct pci_dev *pdev = plat_dev->dev.platform_data;
        struct dwc_pcie_pmu *pcie_pmu;
        char *name;
-       u32 sbdf, val;
+       u32 sbdf;
        u16 vsec;
        int ret;
 
-       vsec = pci_find_vsec_capability(pdev, pdev->vendor,
-                                       DWC_PCIE_VSEC_RAS_DES_ID);
-       pci_read_config_dword(pdev, vsec + PCI_VNDR_HEADER, &val);
+       vsec = dwc_pcie_des_cap(pdev);
+       if (!vsec)
+               return -ENODEV;
+
        sbdf = plat_dev->id;
        name = devm_kasprintf(&plat_dev->dev, GFP_KERNEL, "dwc_rootport_%x", sbdf);
        if (!name)
@@ -730,7 +736,7 @@ static int __init dwc_pcie_pmu_init(void)
        int ret;
 
        for_each_pci_dev(pdev) {
-               if (!dwc_pcie_match_des_cap(pdev))
+               if (!dwc_pcie_des_cap(pdev))
                        continue;
 
                ret = dwc_pcie_register_dev(pdev);