diff options
| author | Hayes Wang <hayeswang@realtek.com> | 2020-01-22 16:02:11 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-01-23 11:20:57 +0100 |
| commit | a0246dafe684a6d5ad31ccd59af0334ccf0cc7b2 (patch) | |
| tree | 80fc7ee2c75e7c3f84231ca346cbd11a89040fe4 /drivers/net/usb | |
| parent | d7f1b59655efb5a285d227c8f9853a98eab5c2fd (diff) | |
| download | linux-stable-a0246dafe684a6d5ad31ccd59af0334ccf0cc7b2.tar.gz linux-stable-a0246dafe684a6d5ad31ccd59af0334ccf0cc7b2.tar.bz2 linux-stable-a0246dafe684a6d5ad31ccd59af0334ccf0cc7b2.zip | |
r8152: don't enable U1U2 with USB_SPEED_HIGH for RTL8153B
For certain platforms, it causes USB reset periodically.
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
| -rw-r--r-- | drivers/net/usb/r8152.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 7efeddad1fc8..b1a00f29455b 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -3391,7 +3391,8 @@ static void rtl8153b_runtime_enable(struct r8152 *tp, bool enable) r8153b_ups_en(tp, false); r8153_queue_wake(tp, false); rtl_runtime_suspend_enable(tp, false); - r8153b_u1u2en(tp, true); + if (tp->udev->speed != USB_SPEED_HIGH) + r8153b_u1u2en(tp, true); } } @@ -5024,7 +5025,9 @@ static void rtl8153b_up(struct r8152 *tp) ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL3, ocp_data); r8153_aldps_en(tp, true); - r8153b_u1u2en(tp, true); + + if (tp->udev->speed != USB_SPEED_HIGH) + r8153b_u1u2en(tp, true); } static void rtl8153b_down(struct r8152 *tp) @@ -5527,7 +5530,9 @@ static void r8153b_init(struct r8152 *tp) ocp_data &= ~CUR_LINK_OK; ocp_data |= POLL_LINK_CHG; ocp_write_word(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS, ocp_data); - r8153b_u1u2en(tp, true); + + if (tp->udev->speed != USB_SPEED_HIGH) + r8153b_u1u2en(tp, true); usb_enable_lpm(tp->udev); /* MAC clock speed down */ |