On Wed, 7 Aug 2024, Alistair Francis wrote: > PCIe r6.1 (which was published July 24) 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. > > This patch renames 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. > > Signed-off-by: Alistair Francis <alistair.francis@xxxxxxx> > Reviewed-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx> > --- > diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h > index 94c00996e633..795e49304ae4 100644 > --- a/include/uapi/linux/pci_regs.h > +++ b/include/uapi/linux/pci_regs.h > @@ -1146,9 +1146,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 This change (removal of the old define) is inside UAPI header, so it does seem something that is not allowed. > #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 > -- i.
