| Message ID | 20200319154051.30609-10-diana.craciun@oss.nxp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | bus/fsl-mc: Extend mc-bus driver functionalities in preparation for mc-bus VFIO support | expand |
On 3/19/2020 5:40 PM, Diana Craciun wrote: > Both DPRC driver and VFIO driver use a 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 | 77 +++++++++++++++++++++----------- > drivers/bus/fsl-mc/mc-io.c | 7 ++- > include/linux/fsl/mc.h | 2 + > 3 files changed, 60 insertions(+), 26 deletions(-) > > diff --git a/drivers/bus/fsl-mc/dprc-driver.c b/drivers/bus/fsl-mc/dprc-driver.c > index a655e3fee291..0fe45c301858 100644 > --- a/drivers/bus/fsl-mc/dprc-driver.c > +++ b/drivers/bus/fsl-mc/dprc-driver.c > @@ -570,16 +570,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; > @@ -589,12 +588,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: > @@ -678,35 +671,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, NULL, 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/drivers/bus/fsl-mc/mc-io.c b/drivers/bus/fsl-mc/mc-io.c > index 6ae48ad80409..e1dfe4a76519 100644 > --- a/drivers/bus/fsl-mc/mc-io.c > +++ b/drivers/bus/fsl-mc/mc-io.c > @@ -129,7 +129,12 @@ int __must_check fsl_create_mc_io(struct device *dev, > */ > void fsl_destroy_mc_io(struct fsl_mc_io *mc_io) > { > - struct fsl_mc_device *dpmcp_dev = mc_io->dpmcp_dev; > + struct fsl_mc_device *dpmcp_dev; > + > + if (!mc_io) > + return; > + > + dpmcp_dev = mc_io->dpmcp_dev; Is this change related to the patch? --- Best Regards, Laurentiu > if (dpmcp_dev) > fsl_mc_io_unset_dpmcp(mc_io); > diff --git a/include/linux/fsl/mc.h b/include/linux/fsl/mc.h > index e3ba273a1122..59b39c635ec9 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_setup(struct fsl_mc_device *mc_dev); > + > int dprc_cleanup(struct fsl_mc_device *mc_dev); > > /* >
diff --git a/drivers/bus/fsl-mc/dprc-driver.c b/drivers/bus/fsl-mc/dprc-driver.c index a655e3fee291..0fe45c301858 100644 --- a/drivers/bus/fsl-mc/dprc-driver.c +++ b/drivers/bus/fsl-mc/dprc-driver.c @@ -570,16 +570,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; @@ -589,12 +588,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: @@ -678,35 +671,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, NULL, 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/drivers/bus/fsl-mc/mc-io.c b/drivers/bus/fsl-mc/mc-io.c index 6ae48ad80409..e1dfe4a76519 100644 --- a/drivers/bus/fsl-mc/mc-io.c +++ b/drivers/bus/fsl-mc/mc-io.c @@ -129,7 +129,12 @@ int __must_check fsl_create_mc_io(struct device *dev, */ void fsl_destroy_mc_io(struct fsl_mc_io *mc_io) { - struct fsl_mc_device *dpmcp_dev = mc_io->dpmcp_dev; + struct fsl_mc_device *dpmcp_dev; + + if (!mc_io) + return; + + dpmcp_dev = mc_io->dpmcp_dev; if (dpmcp_dev) fsl_mc_io_unset_dpmcp(mc_io); diff --git a/include/linux/fsl/mc.h b/include/linux/fsl/mc.h index e3ba273a1122..59b39c635ec9 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_setup(struct fsl_mc_device *mc_dev); + int dprc_cleanup(struct fsl_mc_device *mc_dev); /*
Both DPRC driver and VFIO driver use a 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 | 77 +++++++++++++++++++++----------- drivers/bus/fsl-mc/mc-io.c | 7 ++- include/linux/fsl/mc.h | 2 + 3 files changed, 60 insertions(+), 26 deletions(-)