Create and export a cleanup function for DPRC. The function
is used by the DPRC driver, but it will be used by the VFIO
driver as well.
Signed-off-by: Diana Craciun <[email protected]>
---
drivers/bus/fsl-mc/dprc-driver.c | 52 ++++++++++++++++++++++++--------
include/linux/fsl/mc.h | 2 ++
2 files changed, 41 insertions(+), 13 deletions(-)
diff --git a/drivers/bus/fsl-mc/dprc-driver.c b/drivers/bus/fsl-mc/dprc-driver.c
index 789220f0372a..a655e3fee291 100644
--- a/drivers/bus/fsl-mc/dprc-driver.c
+++ b/drivers/bus/fsl-mc/dprc-driver.c
@@ -725,33 +725,25 @@ static void dprc_teardown_irq(struct fsl_mc_device *mc_dev)
}
/**
- * dprc_remove - callback invoked when a DPRC is being unbound from this driver
+ * dprc_cleanup - function that cleanups a DPRC
*
* @mc_dev: Pointer to fsl-mc device representing the DPRC
*
- * It removes the DPRC's child objects from Linux (not from the MC) and
- * closes the DPRC device in the MC.
- * It tears down the interrupts that were configured for the DPRC device.
+ * It closes the DPRC device in the MC.
* It destroys the interrupt pool associated with this MC bus.
*/
-static int dprc_remove(struct fsl_mc_device *mc_dev)
+
+int dprc_cleanup(struct fsl_mc_device *mc_dev)
{
int error;
struct fsl_mc_bus *mc_bus = to_fsl_mc_bus(mc_dev);
if (!is_fsl_mc_bus_dprc(mc_dev))
return -EINVAL;
- if (!mc_dev->mc_io)
- return -EINVAL;
- if (!mc_bus->irq_resources)
+ if (!mc_dev->mc_io)
return -EINVAL;
- if (dev_get_msi_domain(&mc_dev->dev))
- dprc_teardown_irq(mc_dev);
-
- device_for_each_child(&mc_dev->dev, NULL, __fsl_mc_device_remove);
-
if (dev_get_msi_domain(&mc_dev->dev)) {
fsl_mc_cleanup_irq_pool(mc_bus);
dev_set_msi_domain(&mc_dev->dev, NULL);
@@ -768,6 +760,40 @@ static int dprc_remove(struct fsl_mc_device *mc_dev)
mc_dev->mc_io = NULL;
}
+ return 0;
+}
+EXPORT_SYMBOL_GPL(dprc_cleanup);
+
+/**
+ * dprc_remove - callback invoked when a DPRC is being unbound from this driver
+ *
+ * @mc_dev: Pointer to fsl-mc device representing the DPRC
+ *
+ * It removes the DPRC's child objects from Linux (not from the MC) and
+ * closes the DPRC device in the MC.
+ * It tears down the interrupts that were configured for the DPRC device.
+ * It destroys the interrupt pool associated with this MC bus.
+ */
+static int dprc_remove(struct fsl_mc_device *mc_dev)
+{
+ int error;
+ struct fsl_mc_bus *mc_bus = to_fsl_mc_bus(mc_dev);
+
+ if (!is_fsl_mc_bus_dprc(mc_dev))
+ return -EINVAL;
+
+ if (!mc_bus->irq_resources)
+ return -EINVAL;
+
+ if (dev_get_msi_domain(&mc_dev->dev))
+ dprc_teardown_irq(mc_dev);
+
+ device_for_each_child(&mc_dev->dev, NULL, __fsl_mc_device_remove);
+
+ error = dprc_cleanup(mc_dev);
+ if (error < 0)
+ dev_err(&mc_dev->dev, "dprc_close() failed: %d\n", error);
+
dev_info(&mc_dev->dev, "DPRC device unbound from driver");
return 0;
}
diff --git a/include/linux/fsl/mc.h b/include/linux/fsl/mc.h
index 2bdd96a482fb..e3ba273a1122 100644
--- a/include/linux/fsl/mc.h
+++ b/include/linux/fsl/mc.h
@@ -480,6 +480,8 @@ int dprc_scan_container(struct fsl_mc_device *mc_bus_dev,
const char *driver_override,
bool alloc_interrupts);
+int dprc_cleanup(struct fsl_mc_device *mc_dev);
+
/*
* Data Path Buffer Pool (DPBP) API
* Contains initialization APIs and runtime control APIs for DPBP
--
2.17.1
On 3/19/2020 5:40 PM, Diana Craciun wrote:
> Create and export a cleanup function for DPRC. The function
> is used by the DPRC driver, but it will be used by the VFIO
> driver as well.
>
> Signed-off-by: Diana Craciun <[email protected]>
> ---
> drivers/bus/fsl-mc/dprc-driver.c | 52 ++++++++++++++++++++++++--------
> include/linux/fsl/mc.h | 2 ++
> 2 files changed, 41 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/bus/fsl-mc/dprc-driver.c b/drivers/bus/fsl-mc/dprc-driver.c
> index 789220f0372a..a655e3fee291 100644
> --- a/drivers/bus/fsl-mc/dprc-driver.c
> +++ b/drivers/bus/fsl-mc/dprc-driver.c
> @@ -725,33 +725,25 @@ static void dprc_teardown_irq(struct fsl_mc_device *mc_dev)
> }
>
> /**
> - * dprc_remove - callback invoked when a DPRC is being unbound from this driver
> + * dprc_cleanup - function that cleanups a DPRC
> *
> * @mc_dev: Pointer to fsl-mc device representing the DPRC
> *
> - * It removes the DPRC's child objects from Linux (not from the MC) and
> - * closes the DPRC device in the MC.
> - * It tears down the interrupts that were configured for the DPRC device.
> + * It closes the DPRC device in the MC.
> * It destroys the interrupt pool associated with this MC bus.
> */
> -static int dprc_remove(struct fsl_mc_device *mc_dev)
> +
nit: extra white space?
---
Best Regards, Laurentiu
> +int dprc_cleanup(struct fsl_mc_device *mc_dev)
> {
> int error;
> struct fsl_mc_bus *mc_bus = to_fsl_mc_bus(mc_dev);
>
> if (!is_fsl_mc_bus_dprc(mc_dev))
> return -EINVAL;
> - if (!mc_dev->mc_io)
> - return -EINVAL;
>
> - if (!mc_bus->irq_resources)
> + if (!mc_dev->mc_io)
> return -EINVAL;
>
> - if (dev_get_msi_domain(&mc_dev->dev))
> - dprc_teardown_irq(mc_dev);
> -
> - device_for_each_child(&mc_dev->dev, NULL, __fsl_mc_device_remove);
> -
> if (dev_get_msi_domain(&mc_dev->dev)) {
> fsl_mc_cleanup_irq_pool(mc_bus);
> dev_set_msi_domain(&mc_dev->dev, NULL);
> @@ -768,6 +760,40 @@ static int dprc_remove(struct fsl_mc_device *mc_dev)
> mc_dev->mc_io = NULL;
> }
>
> + return 0;
> +}
> +EXPORT_SYMBOL_GPL(dprc_cleanup);
> +
> +/**
> + * dprc_remove - callback invoked when a DPRC is being unbound from this driver
> + *
> + * @mc_dev: Pointer to fsl-mc device representing the DPRC
> + *
> + * It removes the DPRC's child objects from Linux (not from the MC) and
> + * closes the DPRC device in the MC.
> + * It tears down the interrupts that were configured for the DPRC device.
> + * It destroys the interrupt pool associated with this MC bus.
> + */
> +static int dprc_remove(struct fsl_mc_device *mc_dev)
> +{
> + int error;
> + struct fsl_mc_bus *mc_bus = to_fsl_mc_bus(mc_dev);
> +
> + if (!is_fsl_mc_bus_dprc(mc_dev))
> + return -EINVAL;
> +
> + if (!mc_bus->irq_resources)
> + return -EINVAL;
> +
> + if (dev_get_msi_domain(&mc_dev->dev))
> + dprc_teardown_irq(mc_dev);
> +
> + device_for_each_child(&mc_dev->dev, NULL, __fsl_mc_device_remove);
> +
> + error = dprc_cleanup(mc_dev);
> + if (error < 0)
> + dev_err(&mc_dev->dev, "dprc_close() failed: %d\n", error);
> +
> dev_info(&mc_dev->dev, "DPRC device unbound from driver");
> return 0;
> }
> diff --git a/include/linux/fsl/mc.h b/include/linux/fsl/mc.h
> index 2bdd96a482fb..e3ba273a1122 100644
> --- a/include/linux/fsl/mc.h
> +++ b/include/linux/fsl/mc.h
> @@ -480,6 +480,8 @@ int dprc_scan_container(struct fsl_mc_device *mc_bus_dev,
> const char *driver_override,
> bool alloc_interrupts);
>
> +int dprc_cleanup(struct fsl_mc_device *mc_dev);
> +
> /*
> * Data Path Buffer Pool (DPBP) API
> * Contains initialization APIs and runtime control APIs for DPBP
>