Skip to content

Commit 7ba6b09

Browse files
superna9999felipebalbi
authored andcommitted
usb: dwc3: core: add support for disabling SS instances in park mode
In certain circumstances, the XHCI SuperSpeed instance in park mode can fail to recover, thus on Amlogic G12A/G12B/SM1 SoCs when there is high load on the single XHCI SuperSpeed instance, the controller can crash like: xhci-hcd xhci-hcd.0.auto: xHCI host not responding to stop endpoint command. xhci-hcd xhci-hcd.0.auto: Host halt failed, -110 xhci-hcd xhci-hcd.0.auto: xHCI host controller not responding, assume dead xhci-hcd xhci-hcd.0.auto: xHCI host not responding to stop endpoint command. hub 2-1.1:1.0: hub_ext_port_status failed (err = -22) xhci-hcd xhci-hcd.0.auto: HC died; cleaning up usb 2-1.1-port1: cannot reset (err = -22) Setting the PARKMODE_DISABLE_SS bit in the DWC3_USB3_GUCTL1 mitigates the issue. The bit is described as : "When this bit is set to '1' all SS bus instances in park mode are disabled" Synopsys explains: The GUCTL1.PARKMODE_DISABLE_SS is only available in dwc_usb3 controller running in host mode. This should not be set for other IPs. This can be disabled by default based on IP, but I recommend to have a property to enable this feature for devices that need this. CC: Dongjin Kim <tobetter@gmail.com> Cc: Jianxin Pan <jianxin.pan@amlogic.com> Cc: Thinh Nguyen <thinhn@synopsys.com> Cc: Jun Li <lijun.kernel@gmail.com> Reported-by: Tim <elatllat@gmail.com> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Signed-off-by: Felipe Balbi <balbi@kernel.org>
1 parent 3d157c2 commit 7ba6b09

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

drivers/usb/dwc3/core.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1029,6 +1029,9 @@ static int dwc3_core_init(struct dwc3 *dwc)
10291029
if (dwc->dis_tx_ipgap_linecheck_quirk)
10301030
reg |= DWC3_GUCTL1_TX_IPGAP_LINECHECK_DIS;
10311031

1032+
if (dwc->parkmode_disable_ss_quirk)
1033+
reg |= DWC3_GUCTL1_PARKMODE_DISABLE_SS;
1034+
10321035
dwc3_writel(dwc->regs, DWC3_GUCTL1, reg);
10331036
}
10341037

@@ -1342,6 +1345,8 @@ static void dwc3_get_properties(struct dwc3 *dwc)
13421345
"snps,dis-del-phy-power-chg-quirk");
13431346
dwc->dis_tx_ipgap_linecheck_quirk = device_property_read_bool(dev,
13441347
"snps,dis-tx-ipgap-linecheck-quirk");
1348+
dwc->parkmode_disable_ss_quirk = device_property_read_bool(dev,
1349+
"snps,parkmode-disable-ss-quirk");
13451350

13461351
dwc->tx_de_emphasis_quirk = device_property_read_bool(dev,
13471352
"snps,tx_de_emphasis_quirk");

drivers/usb/dwc3/core.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@
249249
#define DWC3_GUCTL_HSTINAUTORETRY BIT(14)
250250

251251
/* Global User Control 1 Register */
252+
#define DWC3_GUCTL1_PARKMODE_DISABLE_SS BIT(17)
252253
#define DWC3_GUCTL1_TX_IPGAP_LINECHECK_DIS BIT(28)
253254
#define DWC3_GUCTL1_DEV_L1_EXIT_BY_HW BIT(24)
254255

@@ -1024,6 +1025,8 @@ struct dwc3_scratchpad_array {
10241025
* change quirk.
10251026
* @dis_tx_ipgap_linecheck_quirk: set if we disable u2mac linestate
10261027
* check during HS transmit.
1028+
* @parkmode_disable_ss_quirk: set if we need to disable all SuperSpeed
1029+
* instances in park mode.
10271030
* @tx_de_emphasis_quirk: set if we enable Tx de-emphasis quirk
10281031
* @tx_de_emphasis: Tx de-emphasis value
10291032
* 0 - -6dB de-emphasis
@@ -1215,6 +1218,7 @@ struct dwc3 {
12151218
unsigned dis_u2_freeclk_exists_quirk:1;
12161219
unsigned dis_del_phy_power_chg_quirk:1;
12171220
unsigned dis_tx_ipgap_linecheck_quirk:1;
1221+
unsigned parkmode_disable_ss_quirk:1;
12181222

12191223
unsigned tx_de_emphasis_quirk:1;
12201224
unsigned tx_de_emphasis:2;

0 commit comments

Comments
 (0)