From: Diana Craciun <diana.craciun@nxp.com>
To: linux-kernel@vger.kernel.org, laurentiu.tudor@nxp.com,
gregkh@linuxfoundation.org
Cc: stuyoder@gmail.com, leoyang.li@nxp.com,
linux-arm-kernel@lists.infradead.org, bharatb.linux@gmail.com,
Diana Craciun <diana.craciun@oss.nxp.com>
Subject: [PATCH v3 09/13] bus/fsl-mc: Add a container setup function
Date: Mon, 6 Jul 2020 15:42:39 +0300 [thread overview]
Message-ID: <20200706124243.10697-10-diana.craciun@nxp.com> (raw)
In-Reply-To: <20200706124243.10697-1-diana.craciun@nxp.com>
From: Diana Craciun <diana.craciun@oss.nxp.com>
Both DPRC driver and VFIO driver use the same initialization code
for the DPRC. Introduced a new function which groups this
initialization code. The function is exported and may be
used by VFIO as well.
Signed-off-by: Diana Craciun <diana.craciun@oss.nxp.com>
---
drivers/bus/fsl-mc/dprc-driver.c | 78 ++++++++++++++++++++++----------
include/linux/fsl/mc.h | 2 +
2 files changed, 55 insertions(+), 25 deletions(-)
diff --git a/drivers/bus/fsl-mc/dprc-driver.c b/drivers/bus/fsl-mc/dprc-driver.c
index 07012894cc9c..ec44d025f623 100644
--- a/drivers/bus/fsl-mc/dprc-driver.c
+++ b/drivers/bus/fsl-mc/dprc-driver.c
@@ -564,16 +564,15 @@ static int dprc_setup_irq(struct fsl_mc_device *mc_dev)
}
/**
- * dprc_probe - callback invoked when a DPRC is being bound to this driver
+ * dprc_setup - opens and creates a mc_io for DPRC
*
* @mc_dev: Pointer to fsl-mc device representing a DPRC
*
* It opens the physical DPRC in the MC.
- * It scans the DPRC to discover the MC objects contained in it.
- * It creates the interrupt pool for the MC bus associated with the DPRC.
- * It configures the interrupts for the DPRC device itself.
+ * It configures the DPRC portal used to communicate with MC
*/
-static int dprc_probe(struct fsl_mc_device *mc_dev)
+
+int dprc_setup(struct fsl_mc_device *mc_dev)
{
int error;
size_t region_size;
@@ -583,12 +582,6 @@ static int dprc_probe(struct fsl_mc_device *mc_dev)
bool msi_domain_set = false;
u16 major_ver, minor_ver;
- if (!is_fsl_mc_bus_dprc(mc_dev))
- return -EINVAL;
-
- if (dev_get_msi_domain(&mc_dev->dev))
- return -EINVAL;
-
if (!mc_dev->mc_io) {
/*
* This is a child DPRC:
@@ -635,6 +628,7 @@ static int dprc_probe(struct fsl_mc_device *mc_dev)
} else {
dev_set_msi_domain(&mc_dev->dev, mc_msi_domain);
msi_domain_set = true;
+
}
}
@@ -672,35 +666,69 @@ static int dprc_probe(struct fsl_mc_device *mc_dev)
goto error_cleanup_open;
}
+ return 0;
+
+error_cleanup_open:
+ (void)dprc_close(mc_dev->mc_io, 0, mc_dev->mc_handle);
+
+error_cleanup_msi_domain:
+ if (msi_domain_set)
+ dev_set_msi_domain(&mc_dev->dev, NULL);
+
+ if (mc_io_created) {
+ fsl_destroy_mc_io(mc_dev->mc_io);
+ mc_dev->mc_io = NULL;
+ }
+
+ return error;
+}
+EXPORT_SYMBOL_GPL(dprc_setup);
+
+/**
+ * dprc_probe - callback invoked when a DPRC is being bound to this driver
+ *
+ * @mc_dev: Pointer to fsl-mc device representing a DPRC
+ *
+ * It opens the physical DPRC in the MC.
+ * It scans the DPRC to discover the MC objects contained in it.
+ * It creates the interrupt pool for the MC bus associated with the DPRC.
+ * It configures the interrupts for the DPRC device itself.
+ */
+static int dprc_probe(struct fsl_mc_device *mc_dev)
+{
+ int error;
+
+ if (!is_fsl_mc_bus_dprc(mc_dev))
+ return -EINVAL;
+
+ if (dev_get_msi_domain(&mc_dev->dev))
+ return -EINVAL;
+
+ error = dprc_setup(mc_dev);
+ if (error < 0)
+ return error;
+
/*
* Discover MC objects in DPRC object:
*/
error = dprc_scan_container(mc_dev, true);
if (error < 0)
- goto error_cleanup_open;
+ goto dprc_cleanup;
/*
* Configure interrupt for the DPRC object associated with this MC bus:
*/
error = dprc_setup_irq(mc_dev);
if (error < 0)
- goto error_cleanup_open;
+ goto scan_cleanup;
dev_info(&mc_dev->dev, "DPRC device bound to driver");
return 0;
-error_cleanup_open:
- (void)dprc_close(mc_dev->mc_io, 0, mc_dev->mc_handle);
-
-error_cleanup_msi_domain:
- if (msi_domain_set)
- dev_set_msi_domain(&mc_dev->dev, NULL);
-
- if (mc_io_created) {
- fsl_destroy_mc_io(mc_dev->mc_io);
- mc_dev->mc_io = NULL;
- }
-
+scan_cleanup:
+ device_for_each_child(&mc_dev->dev, NULL, __fsl_mc_device_remove);
+dprc_cleanup:
+ dprc_cleanup(mc_dev);
return error;
}
diff --git a/include/linux/fsl/mc.h b/include/linux/fsl/mc.h
index ee5ffae043a3..7cfe3b304602 100644
--- a/include/linux/fsl/mc.h
+++ b/include/linux/fsl/mc.h
@@ -506,6 +506,8 @@ int dprc_scan_container(struct fsl_mc_device *mc_bus_dev,
int dprc_cleanup(struct fsl_mc_device *mc_dev);
+int dprc_setup(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-07-06 12:43 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-06 12:42 [PATCH v3 00/13] bus/fsl-mc: Extend mc-bus driver functionalities in preparation for mc-bus VFIO support Diana Craciun
2020-07-06 12:42 ` [PATCH v3 01/13] bus/fsl-mc: Do no longer export the total number of irqs outside dprc_scan_objects Diana Craciun
2020-07-06 12:42 ` [PATCH v3 02/13] bus/fsl-mc: Add a new parameter to dprc_scan_objects function Diana Craciun
2020-07-06 12:42 ` [PATCH v3 03/13] bus/fsl-mc: add support for 'driver_override' in the mc-bus Diana Craciun
2020-07-06 13:57 ` Andrew Lunn
2020-07-06 16:35 ` Diana Craciun OSS
2020-07-06 12:42 ` [PATCH v3 04/13] bus/fsl-mc: Set the QMAN/BMAN region flags Diana Craciun
2020-07-06 12:42 ` [PATCH v3 05/13] bus/fsl-mc: Cache the DPRC API version Diana Craciun
2020-07-06 12:42 ` [PATCH v3 06/13] bus/fsl-mc: Add dprc-reset-container support Diana Craciun
2020-07-06 12:42 ` [PATCH v3 07/13] bus/fsl-mc: Export a dprc scan function to be used by multiple entities Diana Craciun
2020-07-06 12:42 ` [PATCH v3 08/13] bus/fsl-mc: Export a cleanup function for DPRC Diana Craciun
2020-07-06 12:42 ` Diana Craciun [this message]
2020-07-06 12:42 ` [PATCH v3 10/13] bus/fsl_mc: Do not rely on caller to provide non NULL mc_io Diana Craciun
2020-07-06 12:42 ` [PATCH v3 11/13] bus/fsl-mc: Export IRQ pool handling functions to be used by VFIO Diana Craciun
2020-07-06 12:42 ` [PATCH v3 12/13] bus/fsl-mc: Extend ICID size from 16bit to 32bit Diana Craciun
2020-07-06 12:42 ` [PATCH v3 13/13] bus/fsl-mc: Add a new version for dprc_get_obj_region command Diana Craciun
2020-07-06 13:14 ` Laurentiu Tudor
2020-07-06 15:49 ` Diana Craciun OSS
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=20200706124243.10697-10-diana.craciun@nxp.com \
--to=diana.craciun@nxp.com \
--cc=bharatb.linux@gmail.com \
--cc=diana.craciun@oss.nxp.com \
--cc=gregkh@linuxfoundation.org \
--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).