CXL: Capability vendor ID changed

Reported by Sean V Kelley <sean.v.kelley@linux.intel.com> on the
linux-pci list.

diff --git a/lib/header.h b/lib/header.h
index 03d40eb9530776e932fce8071f2ed6ec6ffb6602..472816ec93836a37ef947a11b9eac4fa26c2a567 100644 (file)
--- a/lib/header.h
+++ b/lib/header.h
@@ -1055,7 +1055,8 @@
 /* PCIe Designated Vendor-Specific Capability */
 #define PCI_DVSEC_HEADER1      4       /* Designated Vendor-Specific Header 1 */
 #define PCI_DVSEC_HEADER2      8       /* Designated Vendor-Specific Header 2 */
-#define PCI_DVSEC_INTEL_CXL    0       /* Designated Vendor-Specific ID for Intel CXL */
+#define PCI_DVSEC_VENDOR_ID_CXL        0x1e98  /* Designated Vendor-Specific Vendor ID for CXL */
+#define PCI_DVSEC_ID_CXL       0       /* Designated Vendor-Specific ID for Intel CXL */
 
 /* PCIe CXL Designated Vendor-Specific Capabilities, Control, Status */
 #define PCI_CXL_CAP            0x0a    /* CXL Capability Register */

diff --git a/ls-ecaps.c b/ls-ecaps.c
index e0c0e1aa0d02fb0a313e027048e0d6d459e46936..22de109a66223a97de2a42e3404ce6a41e483621 100644 (file)
--- a/ls-ecaps.c
+++ b/ls-ecaps.c
@@ -679,7 +679,7 @@ cap_dvsec(struct device *d, int where)
   u16 id = get_conf_long(d, where + PCI_DVSEC_HEADER2);
 
   printf("Vendor=%04x ID=%04x Rev=%d Len=%d", vendor, id, rev, len);
-  if (vendor == PCI_VENDOR_ID_INTEL && id == PCI_DVSEC_INTEL_CXL && len >= 16)
+  if (vendor == PCI_DVSEC_VENDOR_ID_CXL && id == PCI_DVSEC_ID_CXL && len >= 16)
     cap_dvsec_cxl(d, where);
   else
     printf(" <?>\n");