leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: dwc3: Add disable u2mac linestate check quirk

Browse Source 
This patch adds a quirk to disable USB 2.0 MAC linestate check
during HS transmit. Refer the dwc3 databook, we can use it for
some special platforms if the linestate not reflect the expected
line state(J) during transmission.

When use this quirk, the controller implements a fixed 40-bit
TxEndDelay after the packet is given on UTMI and ignores the
linestate during the transmit of a token (during token-to-token
and token-to-data IPGAP).

On some rockchip platforms (e.g. rk3399), it requires to disable
the u2mac linestate check to decrease the SSPLIT token to SETUP
token inter-packet delay from 566ns to 466ns, and fix the issue
that FS/LS devices not recognized if inserted through USB 3.0 HUB.

Reference from below Linux commit,

commit <65db7a0c9816> ("usb: dwc3: add disable u2mac linestate
check quirk")

Cc: Marek Vasut <marex@denx.de>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
This commit is contained in:
Jagan Teki 2020-05-26 11:33:48 +08:00 committed by Kever Yang
parent b34f8b5de0
commit dc18413adb
3 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/usb/dwc3/core.c
View File

@ -727,6 +727,7 @@ int dwc3_uboot_init(struct dwc3_device *dwc3_dev)
dwc->dis_u3_susphy_quirk = dwc3_dev->dis_u3_susphy_quirk; dwc->dis_u3_susphy_quirk = dwc3_dev->dis_u3_susphy_quirk;
dwc->dis_u2_susphy_quirk = dwc3_dev->dis_u2_susphy_quirk; dwc->dis_u2_susphy_quirk = dwc3_dev->dis_u2_susphy_quirk;
dwc->dis_del_phy_power_chg_quirk = dwc3_dev->dis_del_phy_power_chg_quirk; dwc->dis_del_phy_power_chg_quirk = dwc3_dev->dis_del_phy_power_chg_quirk;
dwc->dis_tx_ipgap_linecheck_quirk = dwc3_dev->dis_tx_ipgap_linecheck_quirk;
dwc->dis_enblslpm_quirk = dwc3_dev->dis_enblslpm_quirk; dwc->dis_enblslpm_quirk = dwc3_dev->dis_enblslpm_quirk;
dwc->dis_u2_freeclk_exists_quirk = dwc3_dev->dis_u2_freeclk_exists_quirk; dwc->dis_u2_freeclk_exists_quirk = dwc3_dev->dis_u2_freeclk_exists_quirk;
@ -936,6 +937,8 @@ void dwc3_of_parse(struct dwc3 *dwc)
"snps,dis_u2_susphy_quirk"); "snps,dis_u2_susphy_quirk");
dwc->dis_del_phy_power_chg_quirk = dev_read_bool(dev, dwc->dis_del_phy_power_chg_quirk = dev_read_bool(dev,
"snps,dis-del-phy-power-chg-quirk"); "snps,dis-del-phy-power-chg-quirk");
dwc->dis_tx_ipgap_linecheck_quirk = dev_read_bool(dev,
"snps,dis-tx-ipgap-linecheck-quirk");
dwc->dis_enblslpm_quirk = dev_read_bool(dev, dwc->dis_enblslpm_quirk = dev_read_bool(dev,
"snps,dis_enblslpm_quirk"); "snps,dis_enblslpm_quirk");
dwc->dis_u2_freeclk_exists_quirk = dev_read_bool(dev, dwc->dis_u2_freeclk_exists_quirk = dev_read_bool(dev,
@ -956,6 +959,7 @@ void dwc3_of_parse(struct dwc3 *dwc)
int dwc3_init(struct dwc3 *dwc) int dwc3_init(struct dwc3 *dwc)
{ {
int ret; int ret;
u32 reg;
dwc3_cache_hwparams(dwc); dwc3_cache_hwparams(dwc);
@ -977,6 +981,22 @@ int dwc3_init(struct dwc3 *dwc)
goto event_fail; goto event_fail;
} }
if (dwc->revision >= DWC3_REVISION_250A) {
reg = dwc3_readl(dwc->regs, DWC3_GUCTL1);
/*
* Enable hardware control of sending remote wakeup
* in HS when the device is in the L1 state.
*/
if (dwc->revision >= DWC3_REVISION_290A)
reg |= DWC3_GUCTL1_DEV_L1_EXIT_BY_HW;
if (dwc->dis_tx_ipgap_linecheck_quirk)
reg |= DWC3_GUCTL1_TX_IPGAP_LINECHECK_DIS;
dwc3_writel(dwc->regs, DWC3_GUCTL1, reg);
}
ret = dwc3_core_init_mode(dwc); ret = dwc3_core_init_mode(dwc);
if (ret) if (ret)
goto mode_fail; goto mode_fail;

7
drivers/usb/dwc3/core.h
View File

@ -74,6 +74,7 @@
#define DWC3_GCTL 0xc110 #define DWC3_GCTL 0xc110
#define DWC3_GEVTEN 0xc114 #define DWC3_GEVTEN 0xc114
#define DWC3_GSTS 0xc118 #define DWC3_GSTS 0xc118
#define DWC3_GUCTL1 0xc11c
#define DWC3_GSNPSID 0xc120 #define DWC3_GSNPSID 0xc120
#define DWC3_GGPIO 0xc124 #define DWC3_GGPIO 0xc124
#define DWC3_GUID 0xc128 #define DWC3_GUID 0xc128
@ -160,6 +161,10 @@
#define DWC3_GCTL_GBLHIBERNATIONEN (1 << 1) #define DWC3_GCTL_GBLHIBERNATIONEN (1 << 1)
#define DWC3_GCTL_DSBLCLKGTNG (1 << 0) #define DWC3_GCTL_DSBLCLKGTNG (1 << 0)
/* Global User Control 1 Register */
#define DWC3_GUCTL1_TX_IPGAP_LINECHECK_DIS BIT(28)
#define DWC3_GUCTL1_DEV_L1_EXIT_BY_HW BIT(24)
/* Global USB2 PHY Configuration Register */ /* Global USB2 PHY Configuration Register */
#define DWC3_GUSB2PHYCFG_PHYSOFTRST (1 << 31) #define DWC3_GUSB2PHYCFG_PHYSOFTRST (1 << 31)
#define DWC3_GUSB2PHYCFG_U2_FREECLK_EXISTS (1 << 30) #define DWC3_GUSB2PHYCFG_U2_FREECLK_EXISTS (1 << 30)
@ -772,6 +777,7 @@ struct dwc3 {
#define DWC3_REVISION_260A 0x5533260a #define DWC3_REVISION_260A 0x5533260a
#define DWC3_REVISION_270A 0x5533270a #define DWC3_REVISION_270A 0x5533270a
#define DWC3_REVISION_280A 0x5533280a #define DWC3_REVISION_280A 0x5533280a
#define DWC3_REVISION_290A 0x5533290a
enum dwc3_ep0_next ep0_next_event; enum dwc3_ep0_next ep0_next_event;
enum dwc3_ep0_state ep0state; enum dwc3_ep0_state ep0state;
@ -825,6 +831,7 @@ struct dwc3 {
unsigned dis_u3_susphy_quirk:1; unsigned dis_u3_susphy_quirk:1;
unsigned dis_u2_susphy_quirk:1; unsigned dis_u2_susphy_quirk:1;
unsigned dis_del_phy_power_chg_quirk:1; unsigned dis_del_phy_power_chg_quirk:1;
unsigned dis_tx_ipgap_linecheck_quirk:1;
unsigned dis_enblslpm_quirk:1; unsigned dis_enblslpm_quirk:1;
unsigned dis_u2_freeclk_exists_quirk:1; unsigned dis_u2_freeclk_exists_quirk:1;

1
include/dwc3-uboot.h
View File

@ -34,6 +34,7 @@ struct dwc3_device {
unsigned dis_u3_susphy_quirk; unsigned dis_u3_susphy_quirk;
unsigned dis_u2_susphy_quirk; unsigned dis_u2_susphy_quirk;
unsigned dis_del_phy_power_chg_quirk; unsigned dis_del_phy_power_chg_quirk;
unsigned dis_tx_ipgap_linecheck_quirk;
unsigned dis_enblslpm_quirk; unsigned dis_enblslpm_quirk;
unsigned dis_u2_freeclk_exists_quirk; unsigned dis_u2_freeclk_exists_quirk;
unsigned tx_de_emphasis_quirk; unsigned tx_de_emphasis_quirk;