Imported Upstream version 16.11.2

[deb_dpdk.git] / lib / librte_eal / bsdapp / eal / eal_pci.c

diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c b/lib/librte_eal/bsdapp/eal/eal_pci.c
index 2d16d78..f1de16e 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/eal_pci.c
+++ b/lib/librte_eal/bsdapp/eal/eal_pci.c
@@ -278,11 +278,16 @@ pci_scan_one(int dev_pci_fd, struct pci_conf *conf)
        /* get subsystem_device id */
        dev->id.subsystem_device_id = conf->pc_subdevice;
 
+       /* get class id */
+       dev->id.class_id = (conf->pc_class << 16) |
+                          (conf->pc_subclass << 8) |
+                          (conf->pc_progif);
+
        /* TODO: get max_vfs */
        dev->max_vfs = 0;
 
        /* FreeBSD has no NUMA support (yet) */
-       dev->numa_node = 0;
+       dev->device.numa_node = 0;
 
        /* FreeBSD has only one pass through driver */
        dev->kdrv = RTE_KDRV_NIC_UIO;
@@ -318,6 +323,7 @@ pci_scan_one(int dev_pci_fd, struct pci_conf *conf)
 
        /* device is valid, add in list (sorted) */
        if (TAILQ_EMPTY(&pci_device_list)) {
+               rte_eal_device_insert(&dev->device);
                TAILQ_INSERT_TAIL(&pci_device_list, dev, next);
        }
        else {
@@ -330,7 +336,7 @@ pci_scan_one(int dev_pci_fd, struct pci_conf *conf)
                                continue;
                        else if (ret < 0) {
                                TAILQ_INSERT_BEFORE(dev2, dev, next);
-                               return 0;
+                               rte_eal_device_insert(&dev->device);
                        } else { /* already registered */
                                dev2->kdrv = dev->kdrv;
                                dev2->max_vfs = dev->max_vfs;
@@ -338,9 +344,10 @@ pci_scan_one(int dev_pci_fd, struct pci_conf *conf)
                                        dev->mem_resource,
                                        sizeof(dev->mem_resource));
                                free(dev);
-                               return 0;
                        }
+                       return 0;
                }
+               rte_eal_device_insert(&dev->device);
                TAILQ_INSERT_TAIL(&pci_device_list, dev, next);
        }
 
@@ -401,6 +408,55 @@ error:
        return -1;
 }
 
+int
+pci_update_device(const struct rte_pci_addr *addr)
+{
+       int fd;
+       struct pci_conf matches[2];
+       struct pci_match_conf match = {
+               .pc_sel = {
+                       .pc_domain = addr->domain,
+                       .pc_bus = addr->bus,
+                       .pc_dev = addr->devid,
+                       .pc_func = addr->function,
+               },
+       };
+       struct pci_conf_io conf_io = {
+               .pat_buf_len = 0,
+               .num_patterns = 1,
+               .patterns = &match,
+               .match_buf_len = sizeof(matches),
+               .matches = &matches[0],
+       };
+
+       fd = open("/dev/pci", O_RDONLY);
+       if (fd < 0) {
+               RTE_LOG(ERR, EAL, "%s(): error opening /dev/pci\n", __func__);
+               goto error;
+       }
+
+       if (ioctl(fd, PCIOCGETCONF, &conf_io) < 0) {
+               RTE_LOG(ERR, EAL, "%s(): error with ioctl on /dev/pci: %s\n",
+                               __func__, strerror(errno));
+               goto error;
+       }
+
+       if (conf_io.num_matches != 1)
+               goto error;
+
+       if (pci_scan_one(fd, &matches[0]) < 0)
+               goto error;
+
+       close(fd);
+
+       return 0;
+
+error:
+       if (fd >= 0)
+               close(fd);
+       return -1;
+}
+
 /* Read PCI config space. */
 int rte_eal_pci_read_config(const struct rte_pci_device *dev,
                            void *buf, size_t len, off_t offset)
@@ -422,7 +478,7 @@ int rte_eal_pci_read_config(const struct rte_pci_device *dev,
                goto error;
        }
 
-       fd = open("/dev/pci", O_RDONLY);
+       fd = open("/dev/pci", O_RDWR);
        if (fd < 0) {
                RTE_LOG(ERR, EAL, "%s(): error opening /dev/pci\n", __func__);
                goto error;
@@ -466,7 +522,7 @@ int rte_eal_pci_write_config(const struct rte_pci_device *dev,
 
        memcpy(&pi.pi_data, buf, len);
 
-       fd = open("/dev/pci", O_RDONLY);
+       fd = open("/dev/pci", O_RDWR);
        if (fd < 0) {
                RTE_LOG(ERR, EAL, "%s(): error opening /dev/pci\n", __func__);
                goto error;
@@ -618,9 +674,6 @@ rte_eal_pci_ioport_unmap(struct rte_pci_ioport *p)
 int
 rte_eal_pci_init(void)
 {
-       TAILQ_INIT(&pci_driver_list);
-       TAILQ_INIT(&pci_device_list);
-
        /* for debug purposes, PCI can be disabled */
        if (internal_config.no_pci)
                return 0;