From: Diana Craciun <diana.craciun@oss.nxp.com>
To: linux-kernel@vger.kernel.org, laurentiu.tudor@nxp.com,
stuyoder@gmail.com, leoyang.li@nxp.com,
linux-arm-kernel@lists.infradead.org, bharatb.yadav@gmail.com
Cc: Diana Craciun <diana.craciun@oss.nxp.com>
Subject: [PATCH 08/10] bus/fsl-mc: Export a cleanup function for DPRC
Date: Thu, 19 Mar 2020 17:40:49 +0200 [thread overview]
Message-ID: <20200319154051.30609-9-diana.craciun@oss.nxp.com> (raw)
In-Reply-To: <20200319154051.30609-1-diana.craciun@oss.nxp.com>
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 <diana.craciun@oss.nxp.com>
---
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
next prev parent reply other threads:[~2020-03-19 15:41 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-19 15:40 [PATCH 00/10] bus/fsl-mc: Extend mc-bus driver functionalities in preparation for mc-bus VFIO support Diana Craciun
2020-03-19 15:40 ` [PATCH 01/10] bus/fsl-mc: Do no longer export the total number of irqs outside dprc_scan_objects Diana Craciun
2020-04-06 14:46 ` Diana Craciun OSS
2020-03-19 15:40 ` [PATCH 02/10] bus/fsl-mc: Add a new parameter to dprc_scan_objects function Diana Craciun
2020-03-23 12:04 ` Laurentiu Tudor
2020-03-19 15:40 ` [PATCH 03/10] bus/fsl-mc: add support for 'driver_override' in the mc-bus Diana Craciun
2020-03-23 12:30 ` Laurentiu Tudor
2020-04-09 11:14 ` Diana Craciun OSS
2020-03-19 15:40 ` [PATCH 04/10] bus/fsl-mc: Propagate driver_override for a child DPRC's children Diana Craciun
2020-03-23 12:35 ` Laurentiu Tudor
2020-03-19 15:40 ` [PATCH 05/10] bus/fsl-mc: Set the QMAN/BMAN region flags Diana Craciun
2020-03-19 15:40 ` [PATCH 06/10] bus/fsl-mc: Add dprc-reset-container support Diana Craciun
2020-03-19 15:40 ` [PATCH 07/10] bus/fsl-mc: Export a dprc scan function to be used by multiple entities Diana Craciun
2020-03-23 12:48 ` Laurentiu Tudor
2020-03-19 15:40 ` Diana Craciun [this message]
2020-03-23 12:52 ` [PATCH 08/10] bus/fsl-mc: Export a cleanup function for DPRC Laurentiu Tudor
2020-03-19 15:40 ` [PATCH 09/10] bus/fsl-mc: Add a container setup function Diana Craciun
2020-03-23 13:06 ` Laurentiu Tudor
2020-03-19 15:40 ` [PATCH 10/10] bus/fsl-mc: Export IRQ pool handling functions to be used by VFIO Diana Craciun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200319154051.30609-9-diana.craciun@oss.nxp.com \
--to=diana.craciun@oss.nxp.com \
--cc=bharatb.yadav@gmail.com \
--cc=laurentiu.tudor@nxp.com \
--cc=leoyang.li@nxp.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stuyoder@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).