Skip to contentSkip to conversation

usb: dwc3: reset the address and run_stop on init

PATCH In review Roman Kapl 3 participants 4 messages Sep 5, 2019 – Sep 9, 2019

Subsystems (2)
lore
Share & tools
lore

Roman Kapl

author
#0 lore raw

PATCH 1/1 usb: dwc3: reset the address and run_stop on init

The address should be set to zero during reset according to the documentation. Clearing RunStop ensures that the host disconnects from the device (it was not cleared by CSFTRST, at least on ls1043).

This allows the dwc3 to properly initialize even if the previous driver did not shutdown the device (e.g. when using virtualization).

---
 drivers/usb/dwc3/core.c | 5 +++++
 1 file changed, 5 insertions(+)
drivers/usb/dwc3/core.c +5 -0
index c9bb93a2c81e..c633f5e0621d 100644
@@ -250,6 +250,7 @@ static int dwc3_core_soft_reset(struct dwc3 *dwc)
 
 	reg = dwc3_readl(dwc->regs, DWC3_DCTL);
 	reg |= DWC3_DCTL_CSFTRST;
+	reg &= ~DWC3_DCTL_RUN_STOP;
 	dwc3_writel(dwc->regs, DWC3_DCTL, reg);
 
 	do {
@@ -266,6 +267,10 @@ static int dwc3_core_soft_reset(struct dwc3 *dwc)
 	return -ETIMEDOUT;
 
 done:
+	reg = dwc3_readl(dwc->regs, DWC3_DCFG);
+	reg &= ~(DWC3_DCFG_DEVADDR_MASK);
+	dwc3_writel(dwc->regs, DWC3_DCFG, reg);
+
 	/*
 	 * For DWC_usb31 controller, once DWC3_DCTL_CSFTRST bit is cleared,
 	 * we must wait at least 50ms before accessing the PHY domain
Signature · 1 line
2.22.0
maintainer
#1 lore raw

Hi,

Quoted 2 lines · Roman Kapl

The address should be set to zero during reset according to the documentation.

That is for usb reset and not core soft reset, and dwc3 already handles that case.

Quoted 5 lines

Clearing RunStop ensures that the host disconnects from the device (it was not cleared by CSFTRST, at least on ls1043).

This allows the dwc3 to properly initialize even if the previous driver did not shutdown the device (e.g. when using virtualization).

This sounds like a workaround to some issue that the function driver did not handle.

Quoted 18 lines
---
  drivers/usb/dwc3/core.c | 5 +++++
  1 file changed, 5 insertions(+)
drivers/usb/dwc3/core.c +1 -0
index c9bb93a2c81e..c633f5e0621d 100644
@@ -250,6 +250,7 @@ static int dwc3_core_soft_reset(struct dwc3 *dwc)
 
  	reg = dwc3_readl(dwc->regs, DWC3_DCTL);
  	reg |= DWC3_DCTL_CSFTRST;
+	reg &= ~DWC3_DCTL_RUN_STOP;
  	dwc3_writel(dwc->regs, DWC3_DCTL, reg);
 
  	do {

drivers/usb/dwc3/core.c static int dwc3_core_soft_reset(struct dwc3 *dwc) · line 276

Quoted 10 lines
drivers/usb/dwc3/core.c +4 -0
@@ -266,6 +267,10 @@ static int dwc3_core_soft_reset(struct dwc3 *dwc)
  	return -ETIMEDOUT;
 
  done:
+	reg = dwc3_readl(dwc->regs, DWC3_DCFG);
+	reg &= ~(DWC3_DCFG_DEVADDR_MASK);
+	dwc3_writel(dwc->regs, DWC3_DCFG, reg);
+
  	/*
  	 * For DWC_usb31 controller, once DWC3_DCTL_CSFTRST bit is cleared,
  	 * we must wait at least 50ms before accessing the PHY domain

BR,
Thinh

#2 lore raw

Hello,

Quoted 8 lines · Thinh Nguyen

Hi,

Quoted 2 lines · Roman Kapl

The address should be set to zero during reset according to the documentation.

That is for usb reset and not core soft reset, and dwc3 already handles that case.

I thought that core soft reset is part of the USB reset (it is done during the init, right?).

Quoted 9 lines
Quoted 6 lines

Clearing RunStop ensures that the host disconnects from the device (it was not cleared by CSFTRST, at least on ls1043).

This allows the dwc3 to properly initialize even if the previous driver did not shutdown the device (e.g. when using virtualization).

This sounds like a workaround to some issue that the function driver did not handle.

I am using the ACM function driver. However, as I said, the issue arises only when the dwc3 driver is in a guest OS that is rebooted (even if the reboot is initiated from within the guest OS, not a hard reset).

Maybe this is out of scope for Linux, trying to 'clean up' after the previous driver?

Thank you, Roman Kapl

Quoted 33 lines
Quoted 19 lines
---
   drivers/usb/dwc3/core.c | 5 +++++
   1 file changed, 5 insertions(+)
drivers/usb/dwc3/core.c +1 -0
index c9bb93a2c81e..c633f5e0621d 100644
@@ -250,6 +250,7 @@ static int dwc3_core_soft_reset(struct dwc3 *dwc)
 
   	reg = dwc3_readl(dwc->regs, DWC3_DCTL);
   	reg |= DWC3_DCTL_CSFTRST;
+	reg &= ~DWC3_DCTL_RUN_STOP;
   	dwc3_writel(dwc->regs, DWC3_DCTL, reg);
 
   	do {

drivers/usb/dwc3/core.c static int dwc3_core_soft_reset(struct dwc3 *dwc) · line 276

Quoted 10 lines
drivers/usb/dwc3/core.c +4 -0
@@ -266,6 +267,10 @@ static int dwc3_core_soft_reset(struct dwc3 *dwc)
   	return -ETIMEDOUT;
 
   done:
+	reg = dwc3_readl(dwc->regs, DWC3_DCFG);
+	reg &= ~(DWC3_DCFG_DEVADDR_MASK);
+	dwc3_writel(dwc->regs, DWC3_DCFG, reg);
+
   	/*
   	 * For DWC_usb31 controller, once DWC3_DCTL_CSFTRST bit is cleared,
   	 * we must wait at least 50ms before accessing the PHY domain

BR,
Thinh

maintainer
#3 lore raw

Hi,

Quoted 6 lines · Roman Kapl

Hello,

Quoted 3 lines · Thinh Nguyen

Hi,

Roman Kapl wrote:

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

The address should be set to zero during reset according to the documentation.

That is for usb reset and not core soft reset, and dwc3 already handles that case.

I thought that core soft reset is part of the USB reset (it is done during the init, right?).

A soft reset is done during device power-on init. It's not part of the USB reset.

Quoted 8 lines
Quoted 8 lines
Quoted 7 lines

Clearing RunStop ensures that the host disconnects from the device (it was not cleared by CSFTRST, at least on ls1043).

This allows the dwc3 to properly initialize even if the previous driver did not shutdown the device (e.g. when using virtualization).

Quoted 7 lines
Quoted 2 lines

This sounds like a workaround to some issue that the function driver did not handle.

I am using the ACM function driver. However, as I said, the issue arises only when the dwc3 driver is in a guest OS that is rebooted (even if the reboot is initiated from within the guest OS, not a hard reset).

Check why it wasn't de-initialized on reboot. Also please describe what problem you saw in the patch.

Quoted 6 lines

Maybe this is out of scope for Linux, trying to 'clean up' after the previous driver?

Thank you, Roman Kapl

BR,
Thinh