lspci: Add support for CXL MLD DVSEC

[pciutils.git] / lib / proc.c

diff --git a/lib/proc.c b/lib/proc.c
index 1b44b4e80643831fd6a98689c4924d4c6b2a297d..9b33863e69e68cfdbc42821c2d87b9fcbd647359 100644 (file)
--- a/lib/proc.c
+++ b/lib/proc.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>

+#include <ctype.h>

 #include <errno.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/types.h>


@@ -69,9 +70,11 @@ proc_scan(struct pci_access *a)
     {
       struct pci_dev *d = pci_alloc_dev(a);
       unsigned int dfn, vend, cnt, known;
     {
       struct pci_dev *d = pci_alloc_dev(a);
       unsigned int dfn, vend, cnt, known;

+      char *driver;
+      int offset;

 
 #define F " " PCIADDR_T_FMT
 
 #define F " " PCIADDR_T_FMT

-      cnt = sscanf(buf, "%x %x %x" F F F F F F F F F F F F F F,
+      cnt = sscanf(buf, "%x %x %x" F F F F F F F F F F F F F F "%n",

             &dfn,
             &vend,
             &d->irq,
             &dfn,
             &vend,
             &d->irq,


@@ -88,7 +91,8 @@ proc_scan(struct pci_access *a)
             &d->size[3],
             &d->size[4],
             &d->size[5],
             &d->size[3],
             &d->size[4],
             &d->size[5],

-            &d->rom_size);
+            &d->rom_size,
+            &offset);

 #undef F
       if (cnt != 9 && cnt != 10 && cnt != 17)
        a->error("proc: parse error (read only %d items)", cnt);
 #undef F
       if (cnt != 9 && cnt != 10 && cnt != 17)
        a->error("proc: parse error (read only %d items)", cnt);


@@ -97,15 +101,29 @@ proc_scan(struct pci_access *a)
       d->func = PCI_FUNC(dfn & 0xff);
       d->vendor_id = vend >> 16U;
       d->device_id = vend & 0xffff;
       d->func = PCI_FUNC(dfn & 0xff);
       d->vendor_id = vend >> 16U;
       d->device_id = vend & 0xffff;

-      known = PCI_FILL_IDENT;
+      known = 0;

       if (!a->buscentric)
        {
       if (!a->buscentric)
        {

-         known |= PCI_FILL_IRQ | PCI_FILL_BASES;
+         known |= PCI_FILL_IDENT | PCI_FILL_IRQ | PCI_FILL_BASES;

          if (cnt >= 10)
            known |= PCI_FILL_ROM_BASE;
          if (cnt >= 17)
            known |= PCI_FILL_SIZES;
        }
          if (cnt >= 10)
            known |= PCI_FILL_ROM_BASE;
          if (cnt >= 17)
            known |= PCI_FILL_SIZES;
        }

+      if (cnt >= 17)
+        {
+          while (buf[offset] && isspace(buf[offset]))
+            ++offset;
+          driver = &buf[offset];
+          while (buf[offset] && !isspace(buf[offset]))
+            ++offset;
+          buf[offset] = '\0';
+          if (driver[0])
+            {
+              pci_set_property(d, PCI_FILL_DRIVER, driver);
+              known |= PCI_FILL_DRIVER;
+            }
+        }

       d->known_fields = known;
       pci_link_dev(a, d);
     }
       d->known_fields = known;
       pci_link_dev(a, d);
     }


@@ -130,6 +148,15 @@ proc_setup(struct pci_dev *d, int rw)
        a->error("File name too long");
       a->fd_rw = a->writeable || rw;
       a->fd = open(buf, a->fd_rw ? O_RDWR : O_RDONLY);
        a->error("File name too long");
       a->fd_rw = a->writeable || rw;
       a->fd = open(buf, a->fd_rw ? O_RDWR : O_RDONLY);

+      if (a->fd < 0)
+       {
+         e = snprintf(buf, sizeof(buf), "%s/%04x:%02x/%02x.%d",
+                      pci_get_param(a, "proc.path"),
+                      d->domain, d->bus, d->dev, d->func);
+         if (e < 0 || e >= (int) sizeof(buf))
+           a->error("File name too long");
+         a->fd = open(buf, a->fd_rw ? O_RDWR : O_RDONLY);
+       }

       if (a->fd < 0)
        a->warning("Cannot open %s", buf);
       a->cached_dev = d;
       if (a->fd < 0)
        a->warning("Cannot open %s", buf);
       a->cached_dev = d;


@@ -197,6 +224,7 @@ struct pci_methods pm_linux_proc = {
   pci_generic_fill_info,
   proc_read,
   proc_write,
   pci_generic_fill_info,
   proc_read,
   proc_write,

+  NULL,                                        /* read_vpd */

   NULL,                                        /* init_dev */
   proc_cleanup_dev
 };
   NULL,                                        /* init_dev */
   proc_cleanup_dev
 };