diff mbox series

[1/1] usb: chipidea: msm: Ensure proper controller reset using role switch API

Message ID 20200507004918.25975-2-peter.chen@kernel.org (mailing list archive)
State Mainlined
Commit 91edf63d5022bd0464788ffb4acc3d5febbaf81d
Headers show
Series usb: chipidea: fixes for v5.7 | expand

Commit Message

Peter Chen May 7, 2020, 12:49 a.m. UTC 
From: Bryan O'Donoghue <bryan.odonoghue@linaro.org>

Currently we check to make sure there is no error state on the extcon
handle for VBUS when writing to the HS_PHY_GENCONFIG_2 register. When using
the USB role-switch API we still need to write to this register absent an
extcon handle.

This patch makes the appropriate update to ensure the write happens if
role-switching is true.

Fixes: 05559f10ed79 ("usb: chipidea: add role switch class support")

Cc: Peter Chen <Peter.Chen@nxp.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: linux-usb@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
---
 drivers/usb/chipidea/ci_hdrc_msm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Greg KH May 7, 2020, 6:45 a.m. UTC | #1 
On Thu, May 07, 2020 at 08:49:18AM +0800, Peter Chen wrote:
> From: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
> 
> Currently we check to make sure there is no error state on the extcon
> handle for VBUS when writing to the HS_PHY_GENCONFIG_2 register. When using
> the USB role-switch API we still need to write to this register absent an
> extcon handle.
> 
> This patch makes the appropriate update to ensure the write happens if
> role-switching is true.
> 
> Fixes: 05559f10ed79 ("usb: chipidea: add role switch class support")
> 
> Cc: Peter Chen <Peter.Chen@nxp.com>

No blank line needed, and you can drop your own Cc: in the patch :)

I'll edit it by hand...

greg k-h
Greg KH May 7, 2020, 6:46 a.m. UTC | #2 
On Thu, May 07, 2020 at 08:49:18AM +0800, Peter Chen wrote:
> From: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
> 
> Currently we check to make sure there is no error state on the extcon
> handle for VBUS when writing to the HS_PHY_GENCONFIG_2 register. When using
> the USB role-switch API we still need to write to this register absent an
> extcon handle.
> 
> This patch makes the appropriate update to ensure the write happens if
> role-switching is true.
> 
> Fixes: 05559f10ed79 ("usb: chipidea: add role switch class support")

This should also go do stable kernels, I'll mark that...
Peter Chen May 7, 2020, 6:48 a.m. UTC | #3 
> 
> On Thu, May 07, 2020 at 08:49:18AM +0800, Peter Chen wrote:
> > From: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
> >
> > Currently we check to make sure there is no error state on the extcon
> > handle for VBUS when writing to the HS_PHY_GENCONFIG_2 register. When
> > using the USB role-switch API we still need to write to this register
> > absent an extcon handle.
> >
> > This patch makes the appropriate update to ensure the write happens if
> > role-switching is true.
> >
> > Fixes: 05559f10ed79 ("usb: chipidea: add role switch class support")
> 
> This should also go do stable kernels, I'll mark that...

Thanks, Greg.

Peter
diff mbox series

Patch

diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c
index af648ba6544d..46105457e1ca 100644
--- a/drivers/usb/chipidea/ci_hdrc_msm.c
+++ b/drivers/usb/chipidea/ci_hdrc_msm.c
@@ -114,7 +114,7 @@  static int ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event)
 			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)) {
+		if (!IS_ERR(ci->platdata->vbus_extcon.edev) || ci->role_switch) {
 			hw_write_id_reg(ci, HS_PHY_GENCONFIG_2,
 					HS_PHY_SESS_VLD_CTRL_EN,
 					HS_PHY_SESS_VLD_CTRL_EN);