PCI/DOE: Rename Discovery Response Data Object Contents to type

PCIe r6.1, sec 6.30.1.1, describes a "Vendor ID", a "Data Object Type" and
"Next Index" as the fields in the DOE Discovery Response Data Object. The
DOE driver currently uses both the terms 'type' and 'prot' for the second
element.

Rename all uses of the DOE Discovery Response Data Object to use 'type' as
the second element of the object header, instead of type/prot as it
currently is.

Link: https://lore.kernel.org/r/20250306075211.1855177-2-alistair@alistair23.me
Signed-off-by: Alistair Francis <alistair@alistair23.me>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/pci/doe.c b/drivers/pci/doe.c
index 2f36262e76f86d300330bf89fb747fbafc810b4d..f4508d75ce6984474f1a54a930a6914c7ffcd7d8 100644 (file)
--- a/drivers/pci/doe.c
+++ b/drivers/pci/doe.c
@@ -418,7 +418,7 @@ static int pci_doe_discovery(struct pci_doe_mb *doe_mb, u8 capver, u8 *index, u1
 
        response_pl = le32_to_cpu(response_pl_le);
        *vid = FIELD_GET(PCI_DOE_DATA_OBJECT_DISC_RSP_3_VID, response_pl);
-       *feature = FIELD_GET(PCI_DOE_DATA_OBJECT_DISC_RSP_3_PROTOCOL,
+       *feature = FIELD_GET(PCI_DOE_DATA_OBJECT_DISC_RSP_3_TYPE,
                              response_pl);
        *index = FIELD_GET(PCI_DOE_DATA_OBJECT_DISC_RSP_3_NEXT_INDEX,
                           response_pl);
@@ -426,9 +426,9 @@ static int pci_doe_discovery(struct pci_doe_mb *doe_mb, u8 capver, u8 *index, u1
        return 0;
 }
 
-static void *pci_doe_xa_feat_entry(u16 vid, u8 prot)
+static void *pci_doe_xa_feat_entry(u16 vid, u8 type)
 {
-       return xa_mk_value((vid << 8) | prot);
+       return xa_mk_value((vid << 8) | type);
 }
 
 static int pci_doe_cache_features(struct pci_doe_mb *doe_mb)
@@ -442,19 +442,19 @@ static int pci_doe_cache_features(struct pci_doe_mb *doe_mb)
        do {
                int rc;
                u16 vid;
-               u8 prot;
+               u8 type;
 
                rc = pci_doe_discovery(doe_mb, PCI_EXT_CAP_VER(hdr), &index,
-                                      &vid, &prot);
+                                      &vid, &type);
                if (rc)
                        return rc;
 
                pci_dbg(doe_mb->pdev,
-                       "[%x] Found feature %d vid: %x prot: %x\n",
-                       doe_mb->cap_offset, xa_idx, vid, prot);
+                       "[%x] Found feature %d vid: %x type: %x\n",
+                       doe_mb->cap_offset, xa_idx, vid, type);
 
                rc = xa_insert(&doe_mb->feats, xa_idx++,
-                              pci_doe_xa_feat_entry(vid, prot), GFP_KERNEL);
+                              pci_doe_xa_feat_entry(vid, type), GFP_KERNEL);
                if (rc)
                        return rc;
        } while (index);
@@ -675,7 +675,7 @@ EXPORT_SYMBOL_GPL(pci_doe);
  *
  * @pdev: PCI device
  * @vendor: Vendor ID
- * @prot: Data Object Type
+ * @type: Data Object Type
  *
  * Find first DOE mailbox of a PCI device which supports the given feature.
  *

diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h
index 3445c4970e4d8e72f426071032adf82799aedbf7..7f9af95e2e6a9b89ff33690a11f4874f628e0235 100644 (file)
--- a/include/uapi/linux/pci_regs.h
+++ b/include/uapi/linux/pci_regs.h
@@ -1205,9 +1205,12 @@
 #define PCI_DOE_DATA_OBJECT_DISC_REQ_3_INDEX           0x000000ff
 #define PCI_DOE_DATA_OBJECT_DISC_REQ_3_VER             0x0000ff00
 #define PCI_DOE_DATA_OBJECT_DISC_RSP_3_VID             0x0000ffff
-#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_PROTOCOL                0x00ff0000
+#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_TYPE            0x00ff0000
 #define PCI_DOE_DATA_OBJECT_DISC_RSP_3_NEXT_INDEX      0xff000000
 
+/* Deprecated old name, replaced with PCI_DOE_DATA_OBJECT_DISC_RSP_3_TYPE */
+#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_PROTOCOL                PCI_DOE_DATA_OBJECT_DISC_RSP_3_TYPE
+
 /* Compute Express Link (CXL r3.1, sec 8.1.5) */
 #define PCI_DVSEC_CXL_PORT                             3
 #define PCI_DVSEC_CXL_PORT_CTL                         0x0c