xhci: detect USB 3.2 capable host controllers correctly

USB 3.2 capability in a host can be detected from the
xHCI Supported Protocol Capability major and minor revision fields.

If major is 0x3 and minor 0x20 then the host is USB 3.2 capable.

For USB 3.2 capable hosts set the root hub lane count to 2.

The Major Revision and Minor Revision fields contain a BCD version number.
The value of the Major Revision field is JJh and the value of the Minor
Revision field is MNh for version JJ.M.N, where JJ = major revision number,
M - minor version number, N = sub-minor version number,
e.g. version 3.1 is represented with a value of 0310h.

Also fix the extra whitespace printed out when announcing regular
SuperSpeed hosts.

Cc: <stable@vger.kernel.org> # v4.18+
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 78a2a937dd839087c47a682caff16f571269ccdd..3f79f35d0b19c318c971b941a787e972aefd7054 100644 (file)
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -5065,16 +5065,26 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)
        } else {
                /*
                 * Some 3.1 hosts return sbrn 0x30, use xhci supported protocol
-                * minor revision instead of sbrn
+                * minor revision instead of sbrn. Minor revision is a two digit
+                * BCD containing minor and sub-minor numbers, only show minor.
                 */
-               minor_rev = xhci->usb3_rhub.min_rev;
-               if (minor_rev) {
+               minor_rev = xhci->usb3_rhub.min_rev / 0x10;
+
+               switch (minor_rev) {
+               case 2:
+                       hcd->speed = HCD_USB32;
+                       hcd->self.root_hub->speed = USB_SPEED_SUPER_PLUS;
+                       hcd->self.root_hub->rx_lanes = 2;
+                       hcd->self.root_hub->tx_lanes = 2;
+                       break;
+               case 1:
                        hcd->speed = HCD_USB31;
                        hcd->self.root_hub->speed = USB_SPEED_SUPER_PLUS;
+                       break;
                }
-               xhci_info(xhci, "Host supports USB 3.%x %s SuperSpeed\n",
+               xhci_info(xhci, "Host supports USB 3.%x %sSuperSpeed\n",
                          minor_rev,
-                         minor_rev ? "Enhanced" : "");
+                         minor_rev ? "Enhanced " : "");
 
                xhci->usb3_rhub.hcd = hcd;
                /* xHCI private pointer was set in xhci_pci_probe for the second