From patchwork Wed Sep 7 21:35:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 75700 Delivered-To: patch@linaro.org Received: by 10.140.106.11 with SMTP id d11csp526246qgf; Wed, 7 Sep 2016 14:36:47 -0700 (PDT) X-Received: by 10.98.91.197 with SMTP id p188mr86370714pfb.101.1473284203904; Wed, 07 Sep 2016 14:36:43 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id lo4si43010147pab.269.2016.09.07.14.36.43; Wed, 07 Sep 2016 14:36:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-usb-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-usb-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-usb-owner@vger.kernel.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934355AbcIGVgj (ORCPT + 4 others); Wed, 7 Sep 2016 17:36:39 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:35701 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757493AbcIGVfs (ORCPT ); Wed, 7 Sep 2016 17:35:48 -0400 Received: by mail-pa0-f47.google.com with SMTP id b2so9997134pat.2 for ; Wed, 07 Sep 2016 14:35:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HtGY81R9B+CAYwGqD1YE0fAAX8S9XThfnbY9wu0SvFs=; b=I7Jo3KmvYUEliKW08sxsvS8fFdyMJbuFpan+jqDZy99BbKMylNFmxYci8vVlO3o6rN Gi80lEexGD6mMms9kYmjx53dJ7ywX6vvA3RqnEcl08S/6jfylxYPugRbVdJ1K8/yQVCI leeFc5rCTJsHWxM2xrVIFGXfOT7Ia7d8qUR6w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HtGY81R9B+CAYwGqD1YE0fAAX8S9XThfnbY9wu0SvFs=; b=DMefThA3kydvn7iQtCdRpwdo/VukNYA+/a/Ph7i0gASdzbjtAB3MThOjvj5TYiuK5O JK9YTP6Eb/+4dSraxqGQPg4GjXz0v2NoRYOIQLeZ5dYLhqs6V/GF1ulS6QY4trHjp5dz Nx/4s1+yb/IWySyXNSTOncJhB9GNfvy7Wziv8efqvFmybKHUC4JBZ9St1mAWUoVavs1K sZhlg37ViUVD3C7NntkNZDXOT3GH4J/zmCZ913PHgZU1llv2N/2A81Zt2zaO0nLtGFAn rjBEE2JgFPrBw3Ay9kGNKA8huQ9YuCurJsWpxXpJRFE8dYI/pPg74WCVpGv5jkj2oteR fV0A== X-Gm-Message-State: AE9vXwNKJzcMl41zzcL1Wnm1zTzjmC/f5iw6aziNbIlXkzBkUeadUwo3arAiVp9DpGaaKrV/ X-Received: by 10.66.165.67 with SMTP id yw3mr86854946pab.8.1473284142663; Wed, 07 Sep 2016 14:35:42 -0700 (PDT) Received: from localhost.localdomain (ip68-101-172-78.sd.sd.cox.net. [68.101.172.78]) by smtp.gmail.com with ESMTPSA id 75sm51015417pfw.92.2016.09.07.14.35.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Sep 2016 14:35:42 -0700 (PDT) From: Stephen Boyd To: linux-usb@vger.kernel.org Cc: 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: [PATCH v4 17/22] usb: chipidea: msm: Make platform data driver local instead of global Date: Wed, 7 Sep 2016 14:35:14 -0700 Message-Id: <20160907213519.27340-18-stephen.boyd@linaro.org> X-Mailer: git-send-email 2.9.0.rc2.8.ga28705d In-Reply-To: <20160907213519.27340-1-stephen.boyd@linaro.org> References: <20160907213519.27340-1-stephen.boyd@linaro.org> Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org 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. Acked-by: Peter Chen Cc: Greg Kroah-Hartman Signed-off-by: Stephen Boyd --- drivers/usb/chipidea/ci_hdrc_msm.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) -- 2.9.0.rc2.8.ga28705d -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c index 333817291798..2489a63d3e75 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)) @@ -220,9 +216,8 @@ 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); + plat_ci = ci_hdrc_add_device(&pdev->dev, pdev->resource, + 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);