usb: Check if port status is equal to RxDetect

When using USB 3.0 pen drive with the [AMD] FCH USB XHCI Controller
[1022:7814], the second hotplugging will experience the USB 3.0 pen
drive is recognized as high-speed device. After bisecting the kernel,
I found the commit number 41e7e056cdc662f704fa9262e5c6e213b4ab45dd
(USB: Allow USB 3.0 ports to be disabled.) causes the bug. After doing
some experiments, the bug can be fixed by avoiding executing the function
hub_usb3_port_disable(). Because the port status with [AMD] FCH USB
XHCI Controlleris [1022:7814] is already in RxDetect
(I tried printing out the port status before setting to Disabled state),
it's reasonable to check the port status before really executing
hub_usb3_port_disable().

Fixes: 41e7e056cdc6 (USB: Allow USB 3.0 ports to be disabled.)
Signed-off-by: Gavin Guo <gavin.guo@canonical.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Cc: <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by Gavin Guo and committed by Greg Kroah-Hartman bb86cf56 953c6646

Changed files
+19
drivers
usb
core
+19
drivers/usb/core/hub.c
··· 889 889 if (!hub_is_superspeed(hub->hdev)) 890 890 return -EINVAL; 891 891 892 + ret = hub_port_status(hub, port1, &portstatus, &portchange); 893 + if (ret < 0) 894 + return ret; 895 + 896 + /* 897 + * USB controller Advanced Micro Devices, Inc. [AMD] FCH USB XHCI 898 + * Controller [1022:7814] will have spurious result making the following 899 + * usb 3.0 device hotplugging route to the 2.0 root hub and recognized 900 + * as high-speed device if we set the usb 3.0 port link state to 901 + * Disabled. Since it's already in USB_SS_PORT_LS_RX_DETECT state, we 902 + * check the state here to avoid the bug. 903 + */ 904 + if ((portstatus & USB_PORT_STAT_LINK_STATE) == 905 + USB_SS_PORT_LS_RX_DETECT) { 906 + dev_dbg(&hub->ports[port1 - 1]->dev, 907 + "Not disabling port; link state is RxDetect\n"); 908 + return ret; 909 + } 910 + 892 911 ret = hub_set_port_link_state(hub, port1, USB_SS_PORT_LS_SS_DISABLED); 893 912 if (ret) 894 913 return ret;