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 v5 17/23] usb: chipidea: msm: Restore wrapper settings after reset Date: Mon, 17 Oct 2016 18:56:30 -0700 [thread overview] Message-ID: <20161018015636.11701-18-stephen.boyd@linaro.org> (raw) In-Reply-To: <20161018015636.11701-1-stephen.boyd@linaro.org> When the RESET bit is set in the USBCMD register it resets quite a few of the wrapper's registers to their reset state. This includes the GENCONFIG and GENCONFIG2 registers. Currently this is done by the usb phy and ehci-msm drivers writing into the controller wrapper's MMIO address space. Let's consolidate the register writes into the wrapper driver instead so that we clearly split the wrapper from the phys. 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 | 39 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c index 4b0aadc2be2f..333817291798 100644 --- a/drivers/usb/chipidea/ci_hdrc_msm.c +++ b/drivers/usb/chipidea/ci_hdrc_msm.c @@ -14,11 +14,22 @@ #include <linux/mfd/syscon.h> #include <linux/regmap.h> #include <linux/io.h> +#include <linux/extcon.h> +#include <linux/of.h> #include "ci.h" #define HS_PHY_AHB_MODE 0x0098 +#define HS_PHY_GENCONFIG 0x009c +#define HS_PHY_TXFIFO_IDLE_FORCE_DIS BIT(4) + +#define HS_PHY_GENCONFIG_2 0x00a0 +#define HS_PHY_SESS_VLD_CTRL_EN BIT(7) +#define HS_PHY_ULPI_TX_PKT_EN_CLR_FIX BIT(19) + +#define HSPHY_SESS_VLD_CTRL BIT(25) + /* Vendor base starts at 0x200 beyond CI base */ #define HS_PHY_SEC_CTRL 0x0078 #define HS_PHY_DIG_CLAMP_N BIT(16) @@ -29,6 +40,7 @@ struct ci_hdrc_msm { struct clk *iface_clk; struct clk *fs_clk; bool secondary_phy; + bool hsic; void __iomem *base; }; @@ -48,6 +60,24 @@ static void ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event) /* use AHB transactor, allow posted data writes */ hw_write_id_reg(ci, HS_PHY_AHB_MODE, 0xffffffff, 0x8); + + /* workaround for rx buffer collision issue */ + hw_write_id_reg(ci, HS_PHY_GENCONFIG, + HS_PHY_TXFIFO_IDLE_FORCE_DIS, 0); + + if (!msm_ci->hsic) + hw_write_id_reg(ci, HS_PHY_GENCONFIG_2, + HS_PHY_ULPI_TX_PKT_EN_CLR_FIX, 0); + + if (!IS_ERR(ci->platdata->vbus_extcon.edev)) { + hw_write_id_reg(ci, HS_PHY_GENCONFIG_2, + HS_PHY_SESS_VLD_CTRL_EN, + HS_PHY_SESS_VLD_CTRL_EN); + hw_write(ci, OP_USBCMD, HSPHY_SESS_VLD_CTRL, + HSPHY_SESS_VLD_CTRL); + + } + usb_phy_init(ci->usb_phy); break; case CI_HDRC_CONTROLLER_STOPPED_EVENT: @@ -116,6 +146,7 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev) struct reset_control *reset; struct resource *res; int ret; + struct device_node *ulpi_node, *phy_node; dev_dbg(&pdev->dev, "ci_hdrc_msm_probe\n"); @@ -181,6 +212,14 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev) if (ret) goto err_mux; + ulpi_node = of_find_node_by_name(pdev->dev.of_node, "ulpi"); + if (ulpi_node) { + phy_node = of_get_next_available_child(ulpi_node, NULL); + ci->hsic = of_device_is_compatible(phy_node, "qcom,usb-hsic-phy"); + of_node_put(phy_node); + } + of_node_put(ulpi_node); + plat_ci = ci_hdrc_add_device(&pdev->dev, pdev->resource, pdev->num_resources, &ci_hdrc_msm_platdata); -- 2.10.0.297.gf6727b0
WARNING: multiple messages have this Message-ID (diff)
From: stephen.boyd@linaro.org (Stephen Boyd) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 17/23] usb: chipidea: msm: Restore wrapper settings after reset Date: Mon, 17 Oct 2016 18:56:30 -0700 [thread overview] Message-ID: <20161018015636.11701-18-stephen.boyd@linaro.org> (raw) In-Reply-To: <20161018015636.11701-1-stephen.boyd@linaro.org> When the RESET bit is set in the USBCMD register it resets quite a few of the wrapper's registers to their reset state. This includes the GENCONFIG and GENCONFIG2 registers. Currently this is done by the usb phy and ehci-msm drivers writing into the controller wrapper's MMIO address space. Let's consolidate the register writes into the wrapper driver instead so that we clearly split the wrapper from the phys. 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 | 39 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c index 4b0aadc2be2f..333817291798 100644 --- a/drivers/usb/chipidea/ci_hdrc_msm.c +++ b/drivers/usb/chipidea/ci_hdrc_msm.c @@ -14,11 +14,22 @@ #include <linux/mfd/syscon.h> #include <linux/regmap.h> #include <linux/io.h> +#include <linux/extcon.h> +#include <linux/of.h> #include "ci.h" #define HS_PHY_AHB_MODE 0x0098 +#define HS_PHY_GENCONFIG 0x009c +#define HS_PHY_TXFIFO_IDLE_FORCE_DIS BIT(4) + +#define HS_PHY_GENCONFIG_2 0x00a0 +#define HS_PHY_SESS_VLD_CTRL_EN BIT(7) +#define HS_PHY_ULPI_TX_PKT_EN_CLR_FIX BIT(19) + +#define HSPHY_SESS_VLD_CTRL BIT(25) + /* Vendor base starts at 0x200 beyond CI base */ #define HS_PHY_SEC_CTRL 0x0078 #define HS_PHY_DIG_CLAMP_N BIT(16) @@ -29,6 +40,7 @@ struct ci_hdrc_msm { struct clk *iface_clk; struct clk *fs_clk; bool secondary_phy; + bool hsic; void __iomem *base; }; @@ -48,6 +60,24 @@ static void ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event) /* use AHB transactor, allow posted data writes */ hw_write_id_reg(ci, HS_PHY_AHB_MODE, 0xffffffff, 0x8); + + /* workaround for rx buffer collision issue */ + hw_write_id_reg(ci, HS_PHY_GENCONFIG, + HS_PHY_TXFIFO_IDLE_FORCE_DIS, 0); + + if (!msm_ci->hsic) + hw_write_id_reg(ci, HS_PHY_GENCONFIG_2, + HS_PHY_ULPI_TX_PKT_EN_CLR_FIX, 0); + + if (!IS_ERR(ci->platdata->vbus_extcon.edev)) { + hw_write_id_reg(ci, HS_PHY_GENCONFIG_2, + HS_PHY_SESS_VLD_CTRL_EN, + HS_PHY_SESS_VLD_CTRL_EN); + hw_write(ci, OP_USBCMD, HSPHY_SESS_VLD_CTRL, + HSPHY_SESS_VLD_CTRL); + + } + usb_phy_init(ci->usb_phy); break; case CI_HDRC_CONTROLLER_STOPPED_EVENT: @@ -116,6 +146,7 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev) struct reset_control *reset; struct resource *res; int ret; + struct device_node *ulpi_node, *phy_node; dev_dbg(&pdev->dev, "ci_hdrc_msm_probe\n"); @@ -181,6 +212,14 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev) if (ret) goto err_mux; + ulpi_node = of_find_node_by_name(pdev->dev.of_node, "ulpi"); + if (ulpi_node) { + phy_node = of_get_next_available_child(ulpi_node, NULL); + ci->hsic = of_device_is_compatible(phy_node, "qcom,usb-hsic-phy"); + of_node_put(phy_node); + } + of_node_put(ulpi_node); + plat_ci = ci_hdrc_add_device(&pdev->dev, pdev->resource, pdev->num_resources, &ci_hdrc_msm_platdata); -- 2.10.0.297.gf6727b0
next prev parent reply other threads:[~2016-10-18 1:56 UTC|newest] Thread overview: 125+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-10-18 1:56 [PATCH v5 00/23] Support qcom's HSIC USB and rewrite USB2 HS support Stephen Boyd 2016-10-18 1:56 ` Stephen Boyd 2016-10-18 1:56 ` [PATCH v5 03/23] usb: ulpi: Support device discovery via DT Stephen Boyd 2016-10-18 1:56 ` Stephen Boyd 2016-10-18 1:56 ` Stephen Boyd 2016-10-18 16:44 ` Rob Herring 2016-10-18 16:44 ` Rob Herring 2016-11-11 11:02 ` Heikki Krogerus 2016-11-11 11:02 ` Heikki Krogerus 2016-10-18 1:56 ` [PATCH v5 04/23] usb: chipidea: Only read/write OTGSC from one place Stephen Boyd 2016-10-18 1:56 ` Stephen Boyd 2016-10-18 1:56 ` Stephen Boyd 2016-10-18 1:56 ` [PATCH v5 05/23] usb: chipidea: Handle extcon events properly Stephen Boyd 2016-10-18 1:56 ` Stephen Boyd 2016-10-18 1:56 ` Stephen Boyd 2016-10-18 1:56 ` [PATCH v5 06/23] usb: chipidea: Add platform flag for wrapper phy management Stephen Boyd 2016-10-18 1:56 ` Stephen Boyd 2016-10-18 1:56 ` [PATCH v5 07/23] usb: chipidea: Notify events when switching host mode Stephen Boyd 2016-10-18 1:56 ` Stephen Boyd 2016-10-18 1:56 ` [PATCH v5 08/23] usb: chipidea: Remove locking in ci_udc_start() Stephen Boyd 2016-10-18 1:56 ` Stephen Boyd 2016-10-18 1:56 ` [PATCH v5 09/23] usb: chipidea: Add support for ULPI PHY bus Stephen Boyd 2016-10-18 1:56 ` Stephen Boyd 2016-10-18 1:56 ` [PATCH v5 10/23] usb: chipidea: Consolidate extcon notifiers Stephen Boyd 2016-10-18 1:56 ` Stephen Boyd 2016-10-18 1:56 ` [PATCH v5 11/23] usb: chipidea: Emulate OTGSC interrupt enable path Stephen Boyd 2016-10-18 1:56 ` Stephen Boyd 2016-10-19 1:15 ` Peter Chen 2016-10-19 1:15 ` Peter Chen 2016-10-19 1:53 ` Stephen Boyd 2016-10-19 1:53 ` Stephen Boyd 2016-10-19 8:02 ` Peter Chen 2016-10-19 8:02 ` Peter Chen 2016-10-19 8:02 ` Peter Chen 2016-10-20 6:55 ` Stephen Boyd 2016-10-20 6:55 ` Stephen Boyd 2016-10-20 10:10 ` Peter Chen 2016-10-20 10:10 ` Peter Chen 2016-10-20 10:10 ` Peter Chen 2016-10-20 20:36 ` Stephen Boyd 2016-10-20 20:36 ` Stephen Boyd 2016-10-21 2:14 ` Peter Chen 2016-10-21 2:14 ` Peter Chen 2016-10-21 17:57 ` Stephen Boyd 2016-10-21 17:57 ` Stephen Boyd 2016-10-18 1:56 ` [PATCH v5 12/23] usb: chipidea: msm: Mark device as runtime pm active Stephen Boyd 2016-10-18 1:56 ` Stephen Boyd 2016-10-18 1:56 ` [PATCH v5 13/23] usb: chipidea: msm: Rely on core to override AHBBURST Stephen Boyd 2016-10-18 1:56 ` Stephen Boyd 2016-10-18 1:56 ` [PATCH v5 14/23] usb: chipidea: msm: Use hw_write_id_reg() instead of writel Stephen Boyd 2016-10-18 1:56 ` Stephen Boyd 2016-10-18 1:56 ` [PATCH v5 15/23] usb: chipidea: msm: Add proper clk and reset support Stephen Boyd 2016-10-18 1:56 ` Stephen Boyd 2016-10-18 1:56 ` [PATCH v5 16/23] usb: chipidea: msm: Mux over secondary phy at the right time Stephen Boyd 2016-10-18 1:56 ` Stephen Boyd 2016-10-18 1:56 ` Stephen Boyd [this message] 2016-10-18 1:56 ` [PATCH v5 17/23] usb: chipidea: msm: Restore wrapper settings after reset Stephen Boyd 2016-10-18 1:56 ` [PATCH v5 18/23] usb: chipidea: msm: Make platform data driver local instead of global Stephen Boyd 2016-10-18 1:56 ` Stephen Boyd [not found] ` <20161018015636.11701-1-stephen.boyd-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2016-10-18 1:56 ` [PATCH v5 01/23] of: device: Support loading a module with OF based modalias Stephen Boyd 2016-10-18 1:56 ` Stephen Boyd 2016-10-18 1:56 ` Stephen Boyd 2016-10-18 1:56 ` [PATCH v5 02/23] of: device: Export of_device_{get_modalias,uvent_modalias} to modules Stephen Boyd 2016-10-18 1:56 ` [PATCH v5 02/23] of: device: Export of_device_{get_modalias, uvent_modalias} " Stephen Boyd 2016-10-18 1:56 ` [PATCH v5 02/23] of: device: Export of_device_{get_modalias,uvent_modalias} " Stephen Boyd [not found] ` <20161018015636.11701-3-stephen.boyd-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2016-10-18 5:20 ` [PATCH v5 02/23] of: device: Export of_device_{get_modalias, uvent_modalias} " Chen-Yu Tsai 2016-10-18 5:20 ` Chen-Yu Tsai 2016-10-18 5:20 ` Chen-Yu Tsai 2016-10-24 12:19 ` Chen-Yu Tsai 2016-10-24 12:19 ` Chen-Yu Tsai 2016-10-24 19:48 ` Stephen Boyd 2016-10-24 19:48 ` Stephen Boyd 2016-10-25 1:16 ` Peter Chen 2016-10-25 1:16 ` Peter Chen 2016-11-04 20:51 ` Stephen Boyd 2016-11-04 20:51 ` Stephen Boyd 2016-11-07 1:29 ` Peter Chen 2016-11-07 1:29 ` Peter Chen 2016-11-07 1:29 ` Peter Chen 2016-11-07 1:56 ` Chen-Yu Tsai 2016-11-07 1:56 ` Chen-Yu Tsai [not found] ` <CAGb2v66C15fU1b2+xNDV8Fv2kmmKXyUknA8=9wXztUcs8CNKLg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2016-11-10 21:42 ` Rob Herring 2016-11-10 21:42 ` Rob Herring 2016-11-10 21:42 ` Rob Herring 2016-11-11 3:01 ` Chen-Yu Tsai 2016-11-11 3:01 ` Chen-Yu Tsai 2016-11-11 4:25 ` Javier Martinez Canillas 2016-11-11 4:25 ` Javier Martinez Canillas 2016-11-11 4:25 ` Javier Martinez Canillas 2016-10-18 1:56 ` [PATCH v5 19/23] usb: chipidea: msm: Add reset controller for PHY POR bit Stephen Boyd 2016-10-18 1:56 ` Stephen Boyd 2016-10-18 1:56 ` Stephen Boyd 2016-10-18 1:56 ` [PATCH v5 20/23] usb: chipidea: msm: Handle phy power states Stephen Boyd 2016-10-18 1:56 ` Stephen Boyd 2016-10-18 1:56 ` Stephen Boyd 2016-10-18 1:56 ` [PATCH v5 23/23] phy: Add support for Qualcomm's USB HS phy Stephen Boyd 2016-10-18 1:56 ` Stephen Boyd 2016-10-18 1:56 ` Stephen Boyd 2016-10-18 16:46 ` Rob Herring 2016-10-18 16:46 ` Rob Herring 2016-10-18 16:47 ` Rob Herring 2016-10-18 16:47 ` Rob Herring [not found] ` <20161018015636.11701-24-stephen.boyd-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2016-10-20 23:20 ` Stephen Boyd 2016-10-20 23:20 ` Stephen Boyd 2016-10-20 23:20 ` Stephen Boyd 2016-10-21 2:20 ` Peter Chen 2016-10-21 2:20 ` Peter Chen 2016-10-21 19:33 ` Stephen Boyd 2016-10-21 19:33 ` Stephen Boyd 2016-10-24 2:14 ` Peter Chen 2016-10-24 2:14 ` Peter Chen 2016-10-18 9:31 ` [PATCH v5 00/23] Support qcom's HSIC USB and rewrite USB2 HS support Peter Chen 2016-10-18 9:31 ` Peter Chen 2016-10-18 9:31 ` Peter Chen 2016-10-18 20:51 ` Stephen Boyd 2016-10-18 20:51 ` Stephen Boyd 2016-11-11 7:40 ` Peter Chen 2016-11-11 7:40 ` Peter Chen 2016-11-11 7:40 ` Peter Chen 2016-11-14 19:35 ` Stephen Boyd 2016-11-14 19:35 ` Stephen Boyd 2016-10-18 1:56 ` [PATCH v5 21/23] usb: chipidea: msm: Be silent on probe defer errors Stephen Boyd 2016-10-18 1:56 ` Stephen Boyd 2016-10-18 1:56 ` [PATCH v5 22/23] phy: Add support for Qualcomm's USB HSIC phy Stephen Boyd 2016-10-18 1:56 ` Stephen Boyd
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=20161018015636.11701-18-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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.