From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757772AbcGKFeH (ORCPT ); Mon, 11 Jul 2016 01:34:07 -0400 Received: from mail-pa0-f68.google.com ([209.85.220.68]:35979 "EHLO mail-pa0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757752AbcGKFeE (ORCPT ); Mon, 11 Jul 2016 01:34:04 -0400 Date: Mon, 11 Jul 2016 13:26:25 +0800 From: Peter Chen To: Stephen Boyd Cc: linux-usb@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Andy Gross , Bjorn Andersson , Neil Armstrong , Arnd Bergmann , Felipe Balbi , Peter Chen , Greg Kroah-Hartman Subject: Re: [PATCH v2 17/22] usb: chipidea: msm: Make platform data driver local instead of global Message-ID: <20160711052625.GA31647@shlinux2> References: <20160707222114.1673-1-stephen.boyd@linaro.org> <20160707222114.1673-18-stephen.boyd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160707222114.1673-18-stephen.boyd@linaro.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jul 07, 2016 at 03:21:08PM -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 > Cc: Greg Kroah-Hartman > Signed-off-by: Stephen Boyd > --- > drivers/usb/chipidea/ci_hdrc_msm.c | 20 ++++++++------------ > 1 file changed, 8 insertions(+), 12 deletions(-) > > diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c > index 81437c8cea82..da2d399acdd2 100644 > --- a/drivers/usb/chipidea/ci_hdrc_msm.c > +++ b/drivers/usb/chipidea/ci_hdrc_msm.c > @@ -39,6 +39,7 @@ struct ci_hdrc_msm { > struct clk *core_clk; > struct clk *iface_clk; > struct clk *fs_clk; > + struct ci_hdrc_platform_data pdata; > bool secondary_phy; > bool hsic; > void __iomem *base; > @@ -94,16 +95,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) > { > @@ -164,7 +155,12 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev) > if (IS_ERR(phy)) > return PTR_ERR(phy); > > - ci_hdrc_msm_platdata.usb_phy = phy; > + 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; > + ci->pdata.usb_phy = phy; > > reset = devm_reset_control_get(&pdev->dev, "core"); > if (IS_ERR(reset)) > @@ -221,7 +217,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); Acked-by: Peter Chen -- Best Regards, Peter Chen