CXL: Capability vendor ID changed

[pciutils.git] / lib / pci.h

diff --git a/lib/pci.h b/lib/pci.h
index 8cf9c4c4201000c218de1b9e958b18fbde78f371..f2ebccd338bf1ee6f12dbc8aee05873f86120b25 100644 (file)
--- a/lib/pci.h
+++ b/lib/pci.h
@@ -1,7 +1,7 @@
 /*
  *     The PCI Library
  *
 /*
  *     The PCI Library
  *

- *     Copyright (c) 1997--2018 Martin Mares <mj@ucw.cz>
+ *     Copyright (c) 1997--2020 Martin Mares <mj@ucw.cz>

  *
  *     Can be freely distributed and used under the terms of the GNU GPL.
  */
  *
  *     Can be freely distributed and used under the terms of the GNU GPL.
  */


@@ -16,7 +16,7 @@
 #include "header.h"
 #include "types.h"
 
 #include "header.h"
 #include "types.h"
 

-#define PCI_LIB_VERSION 0x030506
+#define PCI_LIB_VERSION 0x030604

 
 #ifndef PCI_ABI
 #define PCI_ABI
 
 #ifndef PCI_ABI
 #define PCI_ABI


@@ -41,7 +41,8 @@ enum pci_access_type {
   PCI_ACCESS_OBSD_DEVICE,              /* OpenBSD /dev/pci */
   PCI_ACCESS_DUMP,                     /* Dump file */
   PCI_ACCESS_DARWIN,                   /* Darwin */
   PCI_ACCESS_OBSD_DEVICE,              /* OpenBSD /dev/pci */
   PCI_ACCESS_DUMP,                     /* Dump file */
   PCI_ACCESS_DARWIN,                   /* Darwin */

-  PCI_ACCESS_SYLIXOS_DEVICE,   /* SylixOS pci */
+  PCI_ACCESS_SYLIXOS_DEVICE,           /* SylixOS pci */
+  PCI_ACCESS_HURD,                     /* GNU/Hurd */

   PCI_ACCESS_MAX
 };
 
   PCI_ACCESS_MAX
 };
 


@@ -125,7 +126,7 @@ struct pci_dev {
   u8 bus, dev, func;                   /* Bus inside domain, device and function */
 
   /* These fields are set by pci_fill_info() */
   u8 bus, dev, func;                   /* Bus inside domain, device and function */
 
   /* These fields are set by pci_fill_info() */

-  int known_fields;                    /* Set of info fields already known */
+  unsigned int known_fields;           /* Set of info fields already known (see pci_fill_info()) */

   u16 vendor_id, device_id;            /* Identity of the device */
   u16 device_class;                    /* PCI device class */
   int irq;                             /* IRQ number */
   u16 vendor_id, device_id;            /* Identity of the device */
   u16 device_class;                    /* PCI device class */
   int irq;                             /* IRQ number */


@@ -148,8 +149,9 @@ struct pci_dev {
   u8 *cache;                           /* Cached config registers */
   int cache_len;
   int hdrtype;                         /* Cached low 7 bits of header type, -1 if unknown */
   u8 *cache;                           /* Cached config registers */
   int cache_len;
   int hdrtype;                         /* Cached low 7 bits of header type, -1 if unknown */

-  void *aux;                           /* Auxiliary data */
+  void *aux;                           /* Auxiliary data for use by the back-end */

   struct pci_property *properties;     /* A linked list of extra properties */
   struct pci_property *properties;     /* A linked list of extra properties */

+  struct pci_cap *last_cap;            /* Last capability in the list */

 };
 
 #define PCI_ADDR_IO_MASK (~(pciaddr_t) 0x3)
 };
 
 #define PCI_ADDR_IO_MASK (~(pciaddr_t) 0x3)


@@ -173,6 +175,16 @@ int pci_write_block(struct pci_dev *, int pos, u8 *buf, int len) PCI_ABI;
  *
  * Some properties are stored directly in the pci_dev structure.
  * The remaining ones can be accessed through pci_get_string_property().
  *
  * Some properties are stored directly in the pci_dev structure.
  * The remaining ones can be accessed through pci_get_string_property().

+ *
+ * pci_fill_info() returns the current value of pci_dev->known_fields.
+ * This is a bit mask of all fields, which were already obtained during
+ * the lifetime of the device. This includes fields which are not supported
+ * by the particular device -- in that case, the field is left at its default
+ * value, which is 0 for integer fields and NULL for pointers. On the other
+ * hand, we never consider known fields unsupported by the current back-end;
+ * such fields always contain the default value.
+ *
+ * XXX: flags and the result should be unsigned, but we do not want to break the ABI.

  */
 
 int pci_fill_info(struct pci_dev *, int flags) PCI_ABI;
  */
 
 int pci_fill_info(struct pci_dev *, int flags) PCI_ABI;


@@ -192,6 +204,7 @@ char *pci_get_string_property(struct pci_dev *d, u32 prop) PCI_ABI;
 #define PCI_FILL_NUMA_NODE     0x0800
 #define PCI_FILL_IO_FLAGS      0x1000
 #define PCI_FILL_DT_NODE       0x2000          /* Device tree node */
 #define PCI_FILL_NUMA_NODE     0x0800
 #define PCI_FILL_IO_FLAGS      0x1000
 #define PCI_FILL_DT_NODE       0x2000          /* Device tree node */

+#define PCI_FILL_IOMMU_GROUP   0x4000

 #define PCI_FILL_RESCAN                0x00010000
 
 void pci_setup_cache(struct pci_dev *, u8 *cache, int len) PCI_ABI;
 #define PCI_FILL_RESCAN                0x00010000
 
 void pci_setup_cache(struct pci_dev *, u8 *cache, int len) PCI_ABI;


@@ -211,6 +224,8 @@ struct pci_cap {
 #define PCI_CAP_EXTENDED       2       /* PCIe extended capabilities */
 
 struct pci_cap *pci_find_cap(struct pci_dev *, unsigned int id, unsigned int type) PCI_ABI;
 #define PCI_CAP_EXTENDED       2       /* PCIe extended capabilities */
 
 struct pci_cap *pci_find_cap(struct pci_dev *, unsigned int id, unsigned int type) PCI_ABI;

+struct pci_cap *pci_find_cap_nr(struct pci_dev *, unsigned int id, unsigned int type,
+                                unsigned int *cap_number) PCI_ABI;

 
 /*
  *     Filters
 
 /*
  *     Filters