Add .unplug callback to handle driver removal and interrupt cleanup. This enables use of the generic bus cleanup helper while preserving bus-specific cleanup (portal finish, global init reset).
The cleanup function was already performing these operations, so it seems safe to expose them through the unplug operation. Signed-off-by: David Marchand <[email protected]> --- doc/guides/rel_notes/release_26_11.rst | 4 ++ drivers/bus/dpaa/dpaa_bus.c | 57 +++++++++++++++----------- 2 files changed, 38 insertions(+), 23 deletions(-) diff --git a/doc/guides/rel_notes/release_26_11.rst b/doc/guides/rel_notes/release_26_11.rst index 938617ca75..ceb3bf0616 100644 --- a/doc/guides/rel_notes/release_26_11.rst +++ b/doc/guides/rel_notes/release_26_11.rst @@ -55,6 +55,10 @@ New Features Also, make sure to start the actual text at the margin. ======================================================= +* **Added unplug operation support to DPAA bus.** + + Implemented device unplug operation to allow runtime removal of DPAA devices. + Removed Items ------------- diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c index b9d7256c29..3dd372e600 100644 --- a/drivers/bus/dpaa/dpaa_bus.c +++ b/drivers/bus/dpaa/dpaa_bus.c @@ -795,36 +795,45 @@ dpaa_bus_probe_device(struct rte_driver *drv, struct rte_device *dev) } static int -dpaa_bus_cleanup(struct rte_bus *bus) +dpaa_bus_unplug_device(struct rte_device *rte_dev) { - struct rte_dpaa_device *dev; + const struct rte_dpaa_driver *drv = RTE_BUS_DRIVER(rte_dev->driver, *drv); + struct rte_dpaa_device *dev = RTE_BUS_DEVICE(rte_dev, *dev); + int ret = 0; - BUS_INIT_FUNC_TRACE(); - RTE_BUS_FOREACH_DEV(dev, bus) { - const struct rte_dpaa_driver *drv; - int ret = 0; - - if (!rte_dev_is_probed(&dev->device)) - goto next; - drv = RTE_BUS_DRIVER(dev->device.driver, *drv); - if (drv->remove == NULL) - goto next; + if (drv->remove != NULL) { ret = drv->remove(dev); - if (ret < 0) { - rte_errno = errno; - goto next; - } - dev->device.driver = NULL; -next: - dpaa_close_intr(dev->intr_handle); - rte_intr_instance_free(dev->intr_handle); - dev->intr_handle = NULL; + if (ret < 0) + return ret; } + + dpaa_close_intr(dev->intr_handle); + rte_intr_instance_free(dev->intr_handle); + dev->intr_handle = NULL; + + return 0; +} + +static void +dpaa_bus_free_device(struct rte_device *dev) +{ + free(RTE_BUS_DEVICE(dev, struct rte_dpaa_device)); +} + +static int +dpaa_bus_cleanup(struct rte_bus *bus) +{ + int ret; + + BUS_INIT_FUNC_TRACE(); + + ret = rte_bus_generic_cleanup(bus); + dpaa_portal_finish((void *)DPAA_PER_LCORE_PORTAL); dpaa_bus_global_init = 0; DPAA_BUS_DEBUG("Bus cleanup done"); - return 0; + return ret; } /* Adding destructor for double check in case non-gracefully @@ -850,14 +859,16 @@ RTE_FINI_PRIO(dpaa_cleanup, 102) static struct rte_bus rte_dpaa_bus = { .scan = rte_dpaa_bus_scan, .probe = rte_bus_generic_probe, + .free_device = dpaa_bus_free_device, + .cleanup = dpaa_bus_cleanup, .parse = rte_dpaa_bus_parse, .dev_compare = dpaa_bus_dev_compare, .find_device = rte_bus_generic_find_device, .get_iommu_class = rte_dpaa_get_iommu_class, .match = dpaa_bus_match, .probe_device = dpaa_bus_probe_device, + .unplug_device = dpaa_bus_unplug_device, .dev_iterate = rte_bus_generic_dev_iterate, - .cleanup = dpaa_bus_cleanup, }; static struct rte_dpaa_bus_private dpaa_bus = { -- 2.54.0
