pci: keep API compatibility with mmap values

[dpdk.git] / drivers / bus / pci / linux / pci_vfio.c

diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c
index 64cd84a..07e072e 100644 (file)
--- a/drivers/bus/pci/linux/pci_vfio.c
+++ b/drivers/bus/pci/linux/pci_vfio.c
@@ -14,6 +14,7 @@
 #include <rte_log.h>
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
+#include <rte_eal_paging.h>
 #include <rte_malloc.h>
 #include <rte_vfio.h>
 #include <rte_eal.h>
@@ -149,6 +150,38 @@ pci_vfio_get_msix_bar(int fd, struct pci_msix_table *msix_table)
        return 0;
 }
 
+/* enable PCI bus memory space */
+static int
+pci_vfio_enable_bus_memory(int dev_fd)
+{
+       uint16_t cmd;
+       int ret;
+
+       ret = pread64(dev_fd, &cmd, sizeof(cmd),
+                     VFIO_GET_REGION_ADDR(VFIO_PCI_CONFIG_REGION_INDEX) +
+                     PCI_COMMAND);
+
+       if (ret != sizeof(cmd)) {
+               RTE_LOG(ERR, EAL, "Cannot read command from PCI config space!\n");
+               return -1;
+       }
+
+       if (cmd & PCI_COMMAND_MEMORY)
+               return 0;
+
+       cmd |= PCI_COMMAND_MEMORY;
+       ret = pwrite64(dev_fd, &cmd, sizeof(cmd),
+                      VFIO_GET_REGION_ADDR(VFIO_PCI_CONFIG_REGION_INDEX) +
+                      PCI_COMMAND);
+
+       if (ret != sizeof(cmd)) {
+               RTE_LOG(ERR, EAL, "Cannot write command to PCI config space!\n");
+               return -1;
+       }
+
+       return 0;
+}
+
 /* set PCI bus mastering */
 static int
 pci_vfio_set_bus_master(int dev_fd, bool op)
@@ -427,6 +460,11 @@ pci_rte_vfio_setup_device(struct rte_pci_device *dev, int vfio_dev_fd)
                return -1;
        }
 
+       if (pci_vfio_enable_bus_memory(vfio_dev_fd)) {
+               RTE_LOG(ERR, EAL, "Cannot enable bus memory!\n");
+               return -1;
+       }
+
        /* set bus mastering for the device */
        if (pci_vfio_set_bus_master(vfio_dev_fd, true)) {
                RTE_LOG(ERR, EAL, "Cannot set up bus mastering!\n");
@@ -524,7 +562,7 @@ pci_vfio_mmap_bar(int vfio_dev_fd, struct mapped_pci_resource *vfio_res,
                        map_addr = pci_map_resource(bar_addr, vfio_dev_fd,
                                                        memreg[0].offset,
                                                        memreg[0].size,
-                                                       MAP_FIXED);
+                                                       RTE_MAP_FORCE_ADDRESS);
                }
 
                /* if there's a second part, try to map it */
@@ -537,10 +575,10 @@ pci_vfio_mmap_bar(int vfio_dev_fd, struct mapped_pci_resource *vfio_res,
                                                        vfio_dev_fd,
                                                        memreg[1].offset,
                                                        memreg[1].size,
-                                                       MAP_FIXED);
+                                                       RTE_MAP_FORCE_ADDRESS);
                }
 
-               if (map_addr == MAP_FAILED || !map_addr) {
+               if (map_addr == NULL || map_addr == MAP_FAILED) {
                        munmap(bar_addr, bar->size);
                        bar_addr = MAP_FAILED;
                        RTE_LOG(ERR, EAL, "Failed to map pci BAR%d\n",