| Message ID | 20160626072838.28082-18-stephen.boyd@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, Jun 26, 2016 at 12:28:34AM -0700, Stephen Boyd wrote: > If two devices are probed with this same driver, they'll share > the same platform data structure, while the chipidea core layer > writes and modifies it. This can lead to interesting results > especially if one device is an OTG type chipidea controller and > another is a host. Let's create a copy of this structure per each > device instance so that odd things don't happen. > > Cc: Peter Chen <peter.chen@nxp.com> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Signed-off-by: Stephen Boyd <stephen.boyd@linaro.org> > --- > drivers/usb/chipidea/ci_hdrc_msm.c | 19 ++++++++----------- > 1 file changed, 8 insertions(+), 11 deletions(-) > > diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c > index cc6f9b0df9d5..fb4340f02c16 100644 > --- a/drivers/usb/chipidea/ci_hdrc_msm.c > +++ b/drivers/usb/chipidea/ci_hdrc_msm.c > @@ -37,6 +37,7 @@ struct ci_hdrc_msm { > struct clk *core_clk; > struct clk *iface_clk; > struct extcon_dev *vbus_edev; > + struct ci_hdrc_platform_data pdata; > bool secondary_phy; > bool hsic; > void __iomem *base; > @@ -79,16 +80,6 @@ static void ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event) > } > } > > -static struct ci_hdrc_platform_data ci_hdrc_msm_platdata = { > - .name = "ci_hdrc_msm", > - .capoffset = DEF_CAPOFFSET, > - .flags = CI_HDRC_REGS_SHARED | > - CI_HDRC_DISABLE_STREAMING | > - CI_HDRC_OVERRIDE_AHB_BURST, > - > - .notify_event = ci_hdrc_msm_notify_event, > -}; > - > static int ci_hdrc_msm_mux_phy(struct ci_hdrc_msm *ci, > struct platform_device *pdev) > { > @@ -151,6 +142,12 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev) > return -ENOMEM; > platform_set_drvdata(pdev, ci); > > + ci->pdata.name = "ci_hdrc_msm"; > + ci->pdata.capoffset = DEF_CAPOFFSET; > + ci->pdata.flags = CI_HDRC_REGS_SHARED | CI_HDRC_DISABLE_STREAMING | > + CI_HDRC_OVERRIDE_AHB_BURST; > + ci->pdata.notify_event = ci_hdrc_msm_notify_event; > + > reset = devm_reset_control_get(&pdev->dev, "core"); > if (IS_ERR(reset)) > return PTR_ERR(reset); > @@ -204,7 +201,7 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev) > of_node_put(ulpi_node); > > plat_ci = ci_hdrc_add_device(&pdev->dev, pdev->resource, > - pdev->num_resources, &ci_hdrc_msm_platdata); > + pdev->num_resources, &ci->pdata); > if (IS_ERR(plat_ci)) { > dev_err(&pdev->dev, "ci_hdrc_add_device failed!\n"); > ret = PTR_ERR(plat_ci); You can do something like ci_hdrc_usb2.c, it looks simpler.
Quoting Peter Chen (2016-06-29 04:29:25) > On Sun, Jun 26, 2016 at 12:28:34AM -0700, Stephen Boyd wrote: > > @@ -204,7 +201,7 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev) > > of_node_put(ulpi_node); > > > > plat_ci = ci_hdrc_add_device(&pdev->dev, pdev->resource, > > - pdev->num_resources, &ci_hdrc_msm_platdata); > > + pdev->num_resources, &ci->pdata); > > if (IS_ERR(plat_ci)) { > > dev_err(&pdev->dev, "ci_hdrc_add_device failed!\n"); > > ret = PTR_ERR(plat_ci); > > You can do something like ci_hdrc_usb2.c, it looks simpler. > Do what exactly? I'd rather not do a structure copy because that wastes some memory for a structure that is just a template. We add some more code here to assign values directly, but that is smaller size wise than the large platdata structure that only has a few values set in it.
On Wed, Jun 29, 2016 at 12:17:12PM -0700, Stephen Boyd wrote: > Quoting Peter Chen (2016-06-29 04:29:25) > > On Sun, Jun 26, 2016 at 12:28:34AM -0700, Stephen Boyd wrote: > > > @@ -204,7 +201,7 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev) > > > of_node_put(ulpi_node); > > > > > > plat_ci = ci_hdrc_add_device(&pdev->dev, pdev->resource, > > > - pdev->num_resources, &ci_hdrc_msm_platdata); > > > + pdev->num_resources, &ci->pdata); > > > if (IS_ERR(plat_ci)) { > > > dev_err(&pdev->dev, "ci_hdrc_add_device failed!\n"); > > > ret = PTR_ERR(plat_ci); > > > > You can do something like ci_hdrc_usb2.c, it looks simpler. > > > > Do what exactly? I'd rather not do a structure copy because that wastes > some memory for a structure that is just a template. We add some more > code here to assign values directly, but that is smaller size wise than > the large platdata structure that only has a few values set in it. But you add one struct ci_hdrc_platform_data pdata entry at struct ci_hdrc_msm which needs to allocate the memory too. Anyway, it is not a big problem. Acked-by: Peter Chen <peter.chen@nxp.com>
diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c index cc6f9b0df9d5..fb4340f02c16 100644 --- a/drivers/usb/chipidea/ci_hdrc_msm.c +++ b/drivers/usb/chipidea/ci_hdrc_msm.c @@ -37,6 +37,7 @@ struct ci_hdrc_msm { struct clk *core_clk; struct clk *iface_clk; struct extcon_dev *vbus_edev; + struct ci_hdrc_platform_data pdata; bool secondary_phy; bool hsic; void __iomem *base; @@ -79,16 +80,6 @@ static void ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event) } } -static struct ci_hdrc_platform_data ci_hdrc_msm_platdata = { - .name = "ci_hdrc_msm", - .capoffset = DEF_CAPOFFSET, - .flags = CI_HDRC_REGS_SHARED | - CI_HDRC_DISABLE_STREAMING | - CI_HDRC_OVERRIDE_AHB_BURST, - - .notify_event = ci_hdrc_msm_notify_event, -}; - static int ci_hdrc_msm_mux_phy(struct ci_hdrc_msm *ci, struct platform_device *pdev) { @@ -151,6 +142,12 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev) return -ENOMEM; platform_set_drvdata(pdev, ci); + ci->pdata.name = "ci_hdrc_msm"; + ci->pdata.capoffset = DEF_CAPOFFSET; + ci->pdata.flags = CI_HDRC_REGS_SHARED | CI_HDRC_DISABLE_STREAMING | + CI_HDRC_OVERRIDE_AHB_BURST; + ci->pdata.notify_event = ci_hdrc_msm_notify_event; + reset = devm_reset_control_get(&pdev->dev, "core"); if (IS_ERR(reset)) return PTR_ERR(reset); @@ -204,7 +201,7 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev) of_node_put(ulpi_node); plat_ci = ci_hdrc_add_device(&pdev->dev, pdev->resource, - pdev->num_resources, &ci_hdrc_msm_platdata); + pdev->num_resources, &ci->pdata); if (IS_ERR(plat_ci)) { dev_err(&pdev->dev, "ci_hdrc_add_device failed!\n"); ret = PTR_ERR(plat_ci);
If two devices are probed with this same driver, they'll share the same platform data structure, while the chipidea core layer writes and modifies it. This can lead to interesting results especially if one device is an OTG type chipidea controller and another is a host. Let's create a copy of this structure per each device instance so that odd things don't happen. Cc: Peter Chen <peter.chen@nxp.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Stephen Boyd <stephen.boyd@linaro.org> --- drivers/usb/chipidea/ci_hdrc_msm.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)