From: Peter Chen <hzpeterchen@gmail.com>
To: Stephen Boyd <stephen.boyd@linaro.org>
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 <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: Re: [PATCH v2 16/22] usb: chipidea: msm: Restore wrapper settings after reset
Date: Mon, 11 Jul 2016 13:24:44 +0800 [thread overview]
Message-ID: <20160711052444.GH30448@shlinux2> (raw)
In-Reply-To: <20160707222114.1673-17-stephen.boyd@linaro.org>
On Thu, Jul 07, 2016 at 03:21:07PM -0700, Stephen Boyd wrote:
> 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.
>
> Cc: 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 7708bee3ff3e..81437c8cea82 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)
> +
Keep alignment please
Others are ok.
Acked-by: Peter Chen <peter.chen@nxp.com>
> /* 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 (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);
> if (IS_ERR(plat_ci)) {
> --
> 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
--
Best Regards,
Peter Chen
next prev parent reply other threads:[~2016-07-11 5:32 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-07 22:20 [PATCH v2 00/22] Support qcom's HSIC USB and rewrite USB2 HS phy support Stephen Boyd
2016-07-07 22:20 ` [PATCH v2 01/22] of: device: Support loading a module with OF based modalias Stephen Boyd
2016-07-07 22:20 ` [PATCH v2 02/22] of: device: Export of_device_{get_modalias,uvent_modalias} to modules Stephen Boyd
2016-07-07 22:20 ` [PATCH v2 03/22] usb: ulpi: Support device discovery via device properties Stephen Boyd
2016-07-08 9:04 ` Peter Chen
[not found] ` <147043245520.26915.14153612182716236022@sboyd-linaro>
2016-08-23 19:58 ` Stephen Boyd
2016-08-24 7:31 ` Heikki Krogerus
2016-07-18 2:23 ` Rob Herring
[not found] ` <147043320014.26915.7483025835695600714@sboyd-linaro>
2016-08-23 20:00 ` Stephen Boyd
2016-08-23 23:06 ` Rob Herring
2016-08-24 1:06 ` Stephen Boyd
2016-07-07 22:20 ` [PATCH v2 04/22] usb: chipidea: Only read/write OTGSC from one place Stephen Boyd
2016-07-08 9:14 ` Peter Chen
[not found] ` <147043329762.26915.1413688974325107381@sboyd-linaro>
2016-08-06 7:42 ` Peter Chen
2016-07-07 22:20 ` [PATCH v2 05/22] usb: chipidea: Handle extcon events properly Stephen Boyd
2016-07-07 22:20 ` [PATCH v2 06/22] usb: chipidea: Add platform flag for wrapper phy management Stephen Boyd
2016-07-08 9:25 ` Peter Chen
[not found] ` <147043356053.26915.10086819023294264100@sboyd-linaro>
2016-08-06 7:59 ` Peter Chen
[not found] ` <147069998158.10825.8595816732650723884@sboyd-linaro>
2016-08-09 0:36 ` Peter Chen
2016-07-07 22:20 ` [PATCH v2 07/22] usb: chipidea: Notify events when switching host mode Stephen Boyd
2016-07-08 9:29 ` Peter Chen
2016-07-07 22:20 ` [PATCH v2 08/22] usb: chipidea: Remove locking in ci_udc_start() Stephen Boyd
2016-07-08 9:45 ` Peter Chen
[not found] ` <147043403652.26915.10865210145828633146@sboyd-linaro>
2016-08-06 7:54 ` Peter Chen
[not found] ` <147070007426.10825.11324896309403492272@sboyd-linaro>
2016-08-09 0:42 ` Peter Chen
2016-07-07 22:21 ` [PATCH v2 09/22] usb: chipidea: Kick OTG state machine for AVVIS with vbus extcon Stephen Boyd
2016-07-11 2:25 ` Peter Chen
2016-07-07 22:21 ` [PATCH v2 10/22] usb: chipidea: Add support for ULPI PHY bus Stephen Boyd
2016-07-11 3:10 ` Peter Chen
2016-07-11 22:02 ` Stephen Boyd
2016-07-07 22:21 ` [PATCH v2 11/22] usb: chipidea: msm: Mark device as runtime pm active Stephen Boyd
2016-07-11 3:19 ` Peter Chen
2016-07-07 22:21 ` [PATCH v2 12/22] usb: chipidea: msm: Rely on core to override AHBBURST Stephen Boyd
2016-07-11 3:24 ` Peter Chen
2016-07-07 22:21 ` [PATCH v2 13/22] usb: chipidea: msm: Use hw_write_id_reg() instead of writel Stephen Boyd
2016-07-07 22:21 ` [PATCH v2 14/22] usb: chipidea: msm: Add proper clk and reset support Stephen Boyd
2016-07-11 4:32 ` Peter Chen
2016-07-07 22:21 ` [PATCH v2 15/22] usb: chipidea: msm: Mux over secondary phy at the right time Stephen Boyd
2016-07-11 4:43 ` Peter Chen
2016-07-11 22:03 ` Stephen Boyd
2016-07-12 1:07 ` Peter Chen
2016-07-07 22:21 ` [PATCH v2 16/22] usb: chipidea: msm: Restore wrapper settings after reset Stephen Boyd
2016-07-11 5:24 ` Peter Chen [this message]
2016-07-07 22:21 ` [PATCH v2 17/22] usb: chipidea: msm: Make platform data driver local instead of global Stephen Boyd
2016-07-11 5:26 ` Peter Chen
2016-07-07 22:21 ` [PATCH v2 18/22] usb: chipidea: msm: Add reset controller for PHY POR bit Stephen Boyd
2016-07-11 5:32 ` Peter Chen
2016-07-11 22:07 ` Stephen Boyd
2016-07-12 1:09 ` Peter Chen
2016-07-07 22:21 ` [PATCH v2 19/22] usb: chipidea: msm: Handle phy power states Stephen Boyd
2016-07-11 5:38 ` Peter Chen
2016-07-07 22:21 ` [PATCH v2 20/22] usb: chipidea: msm: Be silent on probe defer errors Stephen Boyd
2016-07-11 5:39 ` Peter Chen
2016-07-07 22:21 ` [PATCH v2 21/22] phy: Add support for Qualcomm's USB HSIC phy Stephen Boyd
2016-07-18 2:27 ` Rob Herring
2016-07-07 22:21 ` [PATCH v2 22/22] phy: Add support for Qualcomm's USB HS phy Stephen Boyd
2016-07-18 2:28 ` Rob Herring
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=20160711052444.GH30448@shlinux2 \
--to=hzpeterchen@gmail.com \
--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 \
--cc=stephen.boyd@linaro.org \
/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).