git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pci: rework ioport map error handling
[dpdk.git]
/
lib
/
librte_eal
/
linuxapp
/
eal
/
eal_pci.c
diff --git
a/lib/librte_eal/linuxapp/eal/eal_pci.c
b/lib/librte_eal/linuxapp/eal/eal_pci.c
index
d2e8a09
..
3c2198a
100644
(file)
--- a/
lib/librte_eal/linuxapp/eal/eal_pci.c
+++ b/
lib/librte_eal/linuxapp/eal/eal_pci.c
@@
-362,7
+362,7
@@
pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
else
dev->kdrv = RTE_KDRV_UNKNOWN;
} else
else
dev->kdrv = RTE_KDRV_UNKNOWN;
} else
- dev->kdrv = RTE_KDRV_
UNKNOWN
;
+ dev->kdrv = RTE_KDRV_
NONE
;
/* device is valid, add in list (sorted) */
if (TAILQ_EMPTY(&pci_device_list)) {
/* device is valid, add in list (sorted) */
if (TAILQ_EMPTY(&pci_device_list)) {
@@
-607,12
+607,11
@@
int
rte_eal_pci_ioport_map(struct rte_pci_device *dev, int bar,
struct rte_pci_ioport *p)
{
rte_eal_pci_ioport_map(struct rte_pci_device *dev, int bar,
struct rte_pci_ioport *p)
{
- int ret;
+ int ret
= -1
;
switch (dev->kdrv) {
#ifdef VFIO_PRESENT
case RTE_KDRV_VFIO:
switch (dev->kdrv) {
#ifdef VFIO_PRESENT
case RTE_KDRV_VFIO:
- ret = -1;
if (pci_vfio_is_enabled())
ret = pci_vfio_ioport_map(dev, bar, p);
break;
if (pci_vfio_is_enabled())
ret = pci_vfio_ioport_map(dev, bar, p);
break;
@@
-623,10
+622,7
@@
rte_eal_pci_ioport_map(struct rte_pci_device *dev, int bar,
break;
default:
#if defined(RTE_ARCH_X86)
break;
default:
#if defined(RTE_ARCH_X86)
- /* special case for x86 ... */
ret = pci_ioport_map(dev, bar, p);
ret = pci_ioport_map(dev, bar, p);
-#else
- ret = -1;
#endif
break;
}
#endif
break;
}