From: Stephen Boyd <stephen.boyd@linaro.org>
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 <andy.gross@linaro.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Neil Armstrong <narmstrong@baylibre.com>,
Arnd Bergmann <arnd@arndb.de>, Felipe Balbi <balbi@kernel.org>,
Peter Chen <peter.chen@nxp.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: [PATCH v6 18/25] usb: chipidea: msm: Make platform data driver local instead of global
Date: Wed, 28 Dec 2016 14:57:04 -0800 [thread overview]
Message-ID: <20161228225711.698-19-stephen.boyd@linaro.org> (raw)
In-Reply-To: <20161228225711.698-1-stephen.boyd@linaro.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 <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 | 23 +++++++++--------------
1 file changed, 9 insertions(+), 14 deletions(-)
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);
--
2.10.0.297.gf6727b0
next prev parent reply other threads:[~2016-12-28 22:57 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-28 22:56 [PATCH v6 00/25] Support qcom's HSIC USB and rewrite USB2 HS support Stephen Boyd
2016-12-28 22:56 ` [PATCH v6 01/25] of: device: Support loading a module with OF based modalias Stephen Boyd
2016-12-28 22:56 ` [PATCH v6 02/25] of: device: Export of_device_{get_modalias,uvent_modalias} to modules Stephen Boyd
2016-12-28 22:56 ` [PATCH v6 03/25] usb: ulpi: Support device discovery via DT Stephen Boyd
2017-01-19 6:33 ` Peter Chen
2017-01-19 7:39 ` Greg Kroah-Hartman
2016-12-28 22:56 ` [PATCH v6 04/25] usb: chipidea: Only read/write OTGSC from one place Stephen Boyd
2016-12-28 22:56 ` [PATCH v6 05/25] usb: chipidea: Handle extcon events properly Stephen Boyd
2016-12-28 22:56 ` [PATCH v6 06/25] usb: chipidea: Add platform flag for wrapper phy management Stephen Boyd
2016-12-28 22:56 ` [PATCH v6 07/25] usb: chipidea: Notify events when switching host mode Stephen Boyd
2016-12-28 22:56 ` [PATCH v6 08/25] usb: chipidea: Remove locking in ci_udc_start() Stephen Boyd
2016-12-28 22:56 ` [PATCH v6 09/25] usb: chipidea: Add support for ULPI PHY bus Stephen Boyd
2016-12-28 22:56 ` [PATCH v6 10/25] usb: chipidea: Consolidate extcon notifiers Stephen Boyd
2016-12-28 22:56 ` [PATCH v6 11/25] usb: chipidea: vbus event may exist before starting gadget Stephen Boyd
2017-01-03 8:00 ` Peter Chen
[not found] ` <148418115431.32258.10648057913784071156@sboyd-linaro>
2017-01-12 9:52 ` Peter Chen
2016-12-28 22:56 ` [PATCH v6 12/25] usb: chipidea: msm: Mark device as runtime pm active Stephen Boyd
2016-12-28 22:56 ` [PATCH v6 13/25] usb: chipidea: msm: Rely on core to override AHBBURST Stephen Boyd
2016-12-28 22:57 ` [PATCH v6 14/25] usb: chipidea: msm: Use hw_write_id_reg() instead of writel Stephen Boyd
2016-12-28 22:57 ` [PATCH v6 15/25] usb: chipidea: msm: Add proper clk and reset support Stephen Boyd
2016-12-28 22:57 ` [PATCH v6 16/25] usb: chipidea: msm: Mux over secondary phy at the right time Stephen Boyd
2016-12-28 22:57 ` [PATCH v6 17/25] usb: chipidea: msm: Restore wrapper settings after reset Stephen Boyd
2016-12-28 22:57 ` Stephen Boyd [this message]
2016-12-28 22:57 ` [PATCH v6 19/25] usb: chipidea: msm: Add reset controller for PHY POR bit Stephen Boyd
2016-12-28 22:57 ` [PATCH v6 20/25] usb: chipidea: msm: Handle phy power states Stephen Boyd
2016-12-28 22:57 ` [PATCH v6 21/25] usb: chipidea: msm: Be silent on probe defer errors Stephen Boyd
2016-12-28 22:57 ` [PATCH v6 22/25] usb: chipidea: Drop lock across event_notify during gadget stop Stephen Boyd
2017-01-03 6:46 ` Peter Chen
2016-12-28 22:57 ` [PATCH v6 23/25] usb: chipidea: Pullup D+ in device mode via phy APIs Stephen Boyd
2017-01-03 6:53 ` Peter Chen
[not found] ` <148418039309.32258.7247753739063801774@sboyd-linaro>
2017-01-12 9:50 ` Peter Chen
[not found] ` <148426139182.20672.2422337338087784924@sboyd-linaro>
2017-01-13 3:35 ` Peter Chen
[not found] ` <148433778067.32719.6179204976256776867@sboyd-linaro>
2017-01-16 3:45 ` Peter Chen
[not found] ` <148467591341.23457.3638889856786813589@sboyd-linaro>
2017-01-18 7:34 ` Peter Chen
2017-01-18 20:54 ` Stephen Boyd
2017-01-18 20:57 ` Rob Herring
2017-01-19 6:29 ` Peter Chen
2016-12-28 22:57 ` [PATCH v6 24/25] phy: Add support for Qualcomm's USB HSIC phy Stephen Boyd
2016-12-28 22:57 ` [PATCH v6 25/25] phy: Add support for Qualcomm's USB HS phy Stephen Boyd
2017-01-20 7:40 ` [PATCH v6 00/25] Support qcom's HSIC USB and rewrite USB2 HS support Peter Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161228225711.698-19-stephen.boyd@linaro.org \
--to=stephen.boyd@linaro.org \
--cc=andy.gross@linaro.org \
--cc=arnd@arndb.de \
--cc=balbi@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=narmstrong@baylibre.com \
--cc=peter.chen@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).