x86 requires a special set of instructions to access ioports, but other
architectures let you remap io resources.
So let eal remap io resources by accepting IORESOURCE_IO flag for
architectures other than x86.
Signed-off-by: David Marchand <david.marchand at 6wind.com>
---
lib/librte_eal/common/include/rte_pci.h | 3 ++-
lib/librte_eal/linuxapp/eal/eal_pci.c | 21 +++++++++++++++------
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/lib/librte_eal/common/include/rte_pci.h
b/lib/librte_eal/common/include/rte_pci.h
index 334c12e..8aaab4a 100644
--- a/lib/librte_eal/common/include/rte_pci.h
+++ b/lib/librte_eal/common/include/rte_pci.h
@@ -105,7 +105,8 @@ extern struct pci_device_list pci_device_list; /**< Global
list of PCI devices.
/** Nb. of values in PCI resource format. */
#define PCI_RESOURCE_FMT_NVAL 3
-/** IO resource type: memory address space */
+/** IO resource type: */
+#define IORESOURCE_IO 0x00000100
#define IORESOURCE_MEM 0x00000200
/**
diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c
b/lib/librte_eal/linuxapp/eal/eal_pci.c
index bc5b5be..9c4651d 100644
--- a/lib/librte_eal/linuxapp/eal/eal_pci.c
+++ b/lib/librte_eal/linuxapp/eal/eal_pci.c
@@ -236,12 +236,21 @@ pci_parse_sysfs_resource(const char *filename, struct
rte_pci_device *dev)
goto error;
}
- if (flags & IORESOURCE_MEM) {
- dev->mem_resource[i].phys_addr = phys_addr;
- dev->mem_resource[i].len = end_addr - phys_addr + 1;
- /* not mapped for now */
- dev->mem_resource[i].addr = NULL;
- }
+ /* we only care about IORESOURCE_IO or IORESOURCE_MEM */
+ if (!(flags & IORESOURCE_IO) &&
+ !(flags & IORESOURCE_MEM))
+ continue;
+
+#if defined(RTE_ARCH_X86_64) || defined(RTE_ARCH_I686)
+ /* x86 can not remap ioports, so skip it, remapping code will
+ * look at dev->mem_resource[i].phys_addr == 0 and skip it */
+ if (flags & IORESOURCE_IO)
+ continue;
+#endif
+ dev->mem_resource[i].phys_addr = phys_addr;
+ dev->mem_resource[i].len = end_addr - phys_addr + 1;
+ /* not mapped for now */
+ dev->mem_resource[i].addr = NULL;
}
fclose(f);
return 0;
--
1.7.10.4
