From patchwork Thu Jul 7 22:21:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 71634 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp126620qgy; Thu, 7 Jul 2016 15:23:25 -0700 (PDT) X-Received: by 10.66.150.10 with SMTP id ue10mr4256130pab.71.1467930199373; Thu, 07 Jul 2016 15:23:19 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z14si3894846pfj.116.2016.07.07.15.23.19; Thu, 07 Jul 2016 15:23:19 -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 S932417AbcGGWXL (ORCPT + 5 others); Thu, 7 Jul 2016 18:23:11 -0400 Received: from mail-pf0-f175.google.com ([209.85.192.175]:33409 "EHLO mail-pf0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753404AbcGGWVp (ORCPT ); Thu, 7 Jul 2016 18:21:45 -0400 Received: by mail-pf0-f175.google.com with SMTP id i123so9705587pfg.0 for ; Thu, 07 Jul 2016 15:21:45 -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=udYY+VOpG4FV3JBd2bugHV+iSEeoogK0aP76qLDaxZg=; b=BaoI83V4xYp5vW+KUaBVQ7BDZuStkhS+EU1yx88FuKNcLS6iUYZq9QbWjlsO4iPEKM q/rPuRmXz2u4RU4QMvkVcwsxNCs3bxLzgbI4gPlXnOnsQmBg4NZQxHZimmUjTYzH7xXl pbtW9oR4xlgRbFpkOiPPQZWhvnsu2DUgMzP3Y= 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=udYY+VOpG4FV3JBd2bugHV+iSEeoogK0aP76qLDaxZg=; b=b47MSEAoskag/nL6xa1/P5/fYZXE4slRGD/I6tRJ4aPQVXUlgnpRT8iNoh7L+Ai+/0 FnFEpHzRv7tMw0DOypzRTbcQaPPqFoFE6p2MFuG5Z72XWD5OBdPFPxICFM3dPFjAb7V0 t8qzADbnZFgomuv1GFANlEXJEFlY9kskF7NXfzvXvicAyHpzcbp8kDWzgnvfYYRcy8Co wFjhXTUD+j26Q7Ql7O9mUPOpZyJ+8fe7QtPz1bL8u1kgyPS430ocCoakqjl6nWMw9Wpt acp+onDP5pie3YdB0Wafppcl+s3SY915bEoON8pkr/lJAzXrKij6KAqHChHdJEQQIhmA jXRw== X-Gm-Message-State: ALyK8tLE6m85E+AJNr84DrbrPrCX58q5I5qfMoeH2vMGIH70/ot4mqUSHdx0cDXzMsPhZJFg X-Received: by 10.98.72.150 with SMTP id q22mr4278926pfi.122.1467930104182; Thu, 07 Jul 2016 15:21:44 -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 j8sm6781807paj.22.2016.07.07.15.21.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jul 2016 15:21:43 -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 v2 17/22] usb: chipidea: msm: Make platform data driver local instead of global Date: Thu, 7 Jul 2016 15:21:08 -0700 Message-Id: <20160707222114.1673-18-stephen.boyd@linaro.org> X-Mailer: git-send-email 2.9.0.rc2.8.ga28705d In-Reply-To: <20160707222114.1673-1-stephen.boyd@linaro.org> References: <20160707222114.1673-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. 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(-) -- 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 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); if (IS_ERR(plat_ci)) { dev_err(&pdev->dev, "ci_hdrc_add_device failed!\n"); ret = PTR_ERR(plat_ci);