[dpdk-dev,v1,3/8] bus: remove probe mode configuration structure
Checks
Commit Message
This configuration item will be implemented within the new flexible
framework.
Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>
---
drivers/bus/pci/pci_common.c | 5 +----
lib/librte_eal/common/eal_common_devargs.c | 8 --------
lib/librte_eal/common/include/rte_bus.h | 8 --------
3 files changed, 1 insertion(+), 20 deletions(-)
@@ -370,12 +370,9 @@ rte_pci_probe(void)
struct rte_pci_device *dev = NULL;
size_t probed = 0, failed = 0;
struct rte_devargs *devargs;
- int probe_all = 0;
+ int probe_all = 1;
int ret = 0;
- if (rte_pci_bus.bus.conf.probe_mode != RTE_BUS_PROBE_WHITELIST)
- probe_all = 1;
-
FOREACH_DEVICE_ON_PCIBUS(dev) {
probed++;
@@ -156,7 +156,6 @@ int
rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str)
{
struct rte_devargs *devargs = NULL;
- struct rte_bus *bus = NULL;
const char *dev = devargs_str;
/* use calloc instead of rte_zmalloc as it's called early at init */
@@ -167,15 +166,8 @@ rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str)
if (rte_eal_devargs_parse(dev, devargs))
goto fail;
devargs->type = devtype;
- bus = devargs->bus;
if (devargs->type == RTE_DEVTYPE_BLACKLISTED_PCI)
devargs->policy = RTE_DEV_BLACKLISTED;
- if (bus->conf.probe_mode == RTE_BUS_PROBE_UNDEFINED) {
- if (devargs->policy == RTE_DEV_WHITELISTED)
- bus->conf.probe_mode = RTE_BUS_PROBE_WHITELIST;
- else if (devargs->policy == RTE_DEV_BLACKLISTED)
- bus->conf.probe_mode = RTE_BUS_PROBE_BLACKLIST;
- }
TAILQ_INSERT_TAIL(&devargs_list, devargs, next);
return 0;
@@ -177,13 +177,6 @@ enum rte_bus_probe_mode {
};
/**
- * A structure used to configure bus operations.
- */
-struct rte_bus_conf {
- enum rte_bus_probe_mode probe_mode; /**< Probe policy. */
-};
-
-/**
* Bus configuration items.
*/
enum rte_bus_ctrl_item {
@@ -254,7 +247,6 @@ struct rte_bus {
rte_bus_plug_t plug; /**< Probe single device for drivers */
rte_bus_unplug_t unplug; /**< Remove single device from driver */
rte_bus_parse_t parse; /**< Parse a device name */
- struct rte_bus_conf conf; /**< Bus configuration */
rte_bus_get_iommu_class_t get_iommu_class; /**< Get iommu class */
rte_bus_ctrl_get_t ctrl; /**< Get control operators */
};