linux-arm-msm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Peter Chen <hzpeterchen@gmail.com>
To: Stephen Boyd <stephen.boyd@linaro.org>
Cc: linux-usb@vger.kernel.org, Felipe Balbi <balbi@kernel.org>,
	Arnd Bergmann <arnd@arndb.de>,
	Neil Armstrong <narmstrong@baylibre.com>,
	linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org,
	Bjorn Andersson <bjorn.andersson@linaro.org>,
	Peter Chen <peter.chen@nxp.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Andy Gross <andy.gross@linaro.org>,
	linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v2 19/22] usb: chipidea: msm: Handle phy power states
Date: Mon, 11 Jul 2016 13:38:56 +0800	[thread overview]
Message-ID: <20160711053856.GC31647@shlinux2> (raw)
In-Reply-To: <20160707222114.1673-20-stephen.boyd@linaro.org>

On Thu, Jul 07, 2016 at 03:21:10PM -0700, Stephen Boyd wrote:
> The ULPI phy on qcom platforms needs to be initialized and
> powered on after a USB reset and before we toggle the run/stop
> bit. Otherwise, the phy locks up and doesn't work properly. Hook
> the phy initialization into the RESET event and the phy power off
> into the STOPPED event.
> 
> Cc: Peter Chen <peter.chen@nxp.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
>  drivers/usb/chipidea/ci_hdrc_msm.c | 40 +++++++++++++++++++-------------------
>  drivers/usb/chipidea/core.c        |  8 ++++++--
>  drivers/usb/chipidea/host.c        |  8 ++++++--
>  include/linux/usb/chipidea.h       |  2 +-
>  4 files changed, 33 insertions(+), 25 deletions(-)
> 
> diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c
> index ab6a7713ee5c..5c486c15e043 100644
> --- a/drivers/usb/chipidea/ci_hdrc_msm.c
> +++ b/drivers/usb/chipidea/ci_hdrc_msm.c
> @@ -75,20 +75,33 @@ static const struct reset_control_ops ci_hdrc_msm_reset_ops = {
>  	.reset = ci_hdrc_msm_por_reset,
>  };
>  
> -static void ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event)
> +static int ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event)
>  {
>  	struct device *dev = ci->dev->parent;
>  	struct ci_hdrc_msm *msm_ci = dev_get_drvdata(dev);
> +	int ret;
>  
>  	switch (event) {
>  	case CI_HDRC_CONTROLLER_RESET_EVENT:
>  		dev_dbg(dev, "CI_HDRC_CONTROLLER_RESET_EVENT received\n");
> +
> +		hw_phymode_configure(ci);
>  		if (msm_ci->secondary_phy) {
>  			u32 val = readl_relaxed(msm_ci->base + HS_PHY_SEC_CTRL);
>  			val |= HS_PHY_DIG_CLAMP_N;
>  			writel_relaxed(val, msm_ci->base + HS_PHY_SEC_CTRL);
>  		}
>  
> +		ret = phy_init(ci->phy);
> +		if (ret)
> +			return ret;
> +
> +		ret = phy_power_on(ci->phy);
> +		if (ret) {
> +			phy_exit(ci->phy);
> +			return ret;
> +		}
> +
>  		/* use AHB transactor, allow posted data writes */
>  		hw_write_id_reg(ci, HS_PHY_AHB_MODE, 0xffffffff, 0x8);
>  
> @@ -108,21 +121,18 @@ static void ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event)
>  				 HSPHY_SESS_VLD_CTRL);
>  
>  		}
> -
> -		usb_phy_init(ci->usb_phy);
>  		break;
>  	case CI_HDRC_CONTROLLER_STOPPED_EVENT:
>  		dev_dbg(dev, "CI_HDRC_CONTROLLER_STOPPED_EVENT received\n");
> -		/*
> -		 * Put the phy in non-driving mode. Otherwise host
> -		 * may not detect soft-disconnection.
> -		 */
> -		usb_phy_notify_disconnect(ci->usb_phy, USB_SPEED_UNKNOWN);
> +		phy_power_off(ci->phy);
> +		phy_exit(ci->phy);
>  		break;
>  	default:
>  		dev_dbg(dev, "unknown ci_hdrc event\n");
>  		break;
>  	}
> +
> +	return 0;
>  }
>  
>  static int ci_hdrc_msm_mux_phy(struct ci_hdrc_msm *ci,
> @@ -162,7 +172,6 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev)
>  {
>  	struct ci_hdrc_msm *ci;
>  	struct platform_device *plat_ci;
> -	struct usb_phy *phy;
>  	struct clk *clk;
>  	struct reset_control *reset;
>  	struct resource *res;
> @@ -176,21 +185,12 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev)
>  		return -ENOMEM;
>  	platform_set_drvdata(pdev, ci);
>  
> -	/*
> -	 * OTG(PHY) driver takes care of PHY initialization, clock management,
> -	 * powering up VBUS, mapping of registers address space and power
> -	 * management.
> -	 */
> -	phy = devm_usb_get_phy_by_phandle(&pdev->dev, "usb-phy", 0);
> -	if (IS_ERR(phy))
> -		return PTR_ERR(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_HDRC_OVERRIDE_AHB_BURST |
> +			  CI_HDRC_OVERRIDE_PHY_CONTROL;
>  	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))
> diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
> index f144e1bbcc82..0866c03d66df 100644
> --- a/drivers/usb/chipidea/core.c
> +++ b/drivers/usb/chipidea/core.c
> @@ -327,6 +327,7 @@ void hw_phymode_configure(struct ci_hdrc *ci)
>  			hw_write(ci, OP_PORTSC, PORTSC_STS, PORTSC_STS);
>  	}
>  }
> +EXPORT_SYMBOL_GPL(hw_phymode_configure);
>  
>  /**
>   * _ci_usb_phy_init: initialize phy taking in account both phy and usb_phy
> @@ -503,9 +504,12 @@ int hw_device_reset(struct ci_hdrc *ci)
>  		return ret;
>  	}
>  
> -	if (ci->platdata->notify_event)
> -		ci->platdata->notify_event(ci,
> +	if (ci->platdata->notify_event) {
> +		ret = ci->platdata->notify_event(ci,
>  			CI_HDRC_CONTROLLER_RESET_EVENT);
> +		if (ret)
> +			return ret;
> +	}
>  
>  	/* USBMODE should be configured step by step */
>  	hw_write(ci, OP_USBMODE, USBMODE_CM, USBMODE_CM_IDLE);
> diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c
> index a1d8551ca79d..844be1d02d38 100644
> --- a/drivers/usb/chipidea/host.c
> +++ b/drivers/usb/chipidea/host.c
> @@ -87,8 +87,12 @@ static int ehci_ci_reset(struct usb_hcd *hcd)
>  	if (ret)
>  		return ret;
>  
> -	if (ci->platdata->notify_event)
> -		ci->platdata->notify_event(ci, CI_HDRC_CONTROLLER_RESET_EVENT);
> +	if (ci->platdata->notify_event) {
> +		ret = ci->platdata->notify_event(ci,
> +				CI_HDRC_CONTROLLER_RESET_EVENT);
> +		if (ret)
> +			return ret;
> +	}
>  
>  	ci_platform_configure(ci);
>  
> diff --git a/include/linux/usb/chipidea.h b/include/linux/usb/chipidea.h
> index d07b162073f7..5e76552c81e9 100644
> --- a/include/linux/usb/chipidea.h
> +++ b/include/linux/usb/chipidea.h
> @@ -61,7 +61,7 @@ struct ci_hdrc_platform_data {
>  	enum usb_dr_mode	dr_mode;
>  #define CI_HDRC_CONTROLLER_RESET_EVENT		0
>  #define CI_HDRC_CONTROLLER_STOPPED_EVENT	1
> -	void	(*notify_event) (struct ci_hdrc *ci, unsigned event);
> +	int	(*notify_event) (struct ci_hdrc *ci, unsigned event);
>  	struct regulator	*reg_vbus;
>  	struct usb_otg_caps	ci_otg_caps;
>  	bool			tpl_support;
> -- 

Acked-by: Peter Chen <peter.chen@nxp.com>

-- 

Best Regards,
Peter Chen

  reply	other threads:[~2016-07-11  5:46 UTC|newest]

Thread overview: 65+ 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 02/22] of: device: Export of_device_{get_modalias,uvent_modalias} to modules 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
2016-08-05 21:41     ` Stephen Boyd
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
2016-08-05 21:46     ` Stephen Boyd
2016-08-06  7:59       ` Peter Chen
2016-08-08 23:46         ` Stephen Boyd
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
     [not found]   ` <20160707222114.1673-9-stephen.boyd-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-07-08  9:45     ` Peter Chen
2016-08-05 21:53       ` Stephen Boyd
2016-08-06  7:54         ` Peter Chen
2016-08-08 23:47           ` Stephen Boyd
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
     [not found]   ` <20160707222114.1673-10-stephen.boyd-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-07-11  2:25     ` Peter Chen
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
     [not found] ` <20160707222114.1673-1-stephen.boyd-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
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 03/22] usb: ulpi: Support device discovery via device properties Stephen Boyd
2016-07-08  9:04     ` Peter Chen
2016-08-05 21:27       ` Stephen Boyd
2016-08-23 19:58         ` Stephen Boyd
2016-08-24  7:31           ` Heikki Krogerus
2016-08-26 18:54             ` Stephen Boyd
     [not found]     ` <20160707222114.1673-4-stephen.boyd-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-07-18  2:23       ` Rob Herring
2016-08-05 21:40         ` Stephen Boyd
2016-08-23 20:00           ` Stephen Boyd
     [not found]             ` <CAJOFmgwTPDwdL_cc7f5N09enZNhKwSkWAxdpF39vOBQLfEdVSg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2016-08-23 23:06               ` Rob Herring
2016-08-24  1:06                 ` Stephen Boyd
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 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
     [not found]     ` <20160707222114.1673-16-stephen.boyd-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
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
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 19/22] usb: chipidea: msm: Handle phy power states Stephen Boyd
2016-07-11  5:38     ` Peter Chen [this message]
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
     [not found]     ` <20160707222114.1673-23-stephen.boyd-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-07-18  2:28       ` Rob Herring
2016-07-07 22:21 ` [PATCH v2 18/22] usb: chipidea: msm: Add reset controller for PHY POR bit Stephen Boyd
     [not found]   ` <20160707222114.1673-19-stephen.boyd-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
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 20/22] usb: chipidea: msm: Be silent on probe defer errors Stephen Boyd
2016-07-11  5:39   ` 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=20160711053856.GC31647@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).