Merge tag 'usb-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB/PHY updates from Greg KH:
 "Here is the big patchset of USB and PHY driver updates for 4.13-rc1.

  On the PHY side, they decided to move files around to "make things
  easier" in their tree. Hopefully that wasn't a mistake, but in
  linux-next testing, we haven't had any reported problems.

  There's the usual set of gadget and xhci and musb updates in here as
  well, along with a number of smaller updates for a raft of different
  USB drivers. Full details in the shortlog, nothing really major.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'usb-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (173 commits)
  Add USB quirk for HVR-950q to avoid intermittent device resets
  USB hub_probe: rework ugly goto-into-compound-statement
  usb: host: ohci-pxa27x: Handle return value of clk_prepare_enable
  USB: serial: cp210x: add ID for CEL EM3588 USB ZigBee stick
  usbip: Fix uninitialized variable bug in vhci
  usb: core: read USB ports from DT in the usbport LED trigger driver
  dt-bindings: leds: document new trigger-sources property
  usb: typec: ucsi: Add ACPI driver
  usb: typec: Add support for UCSI interface
  usb: musb: compress return logic into one line
  USB: serial: propagate late probe errors
  USB: serial: refactor port endpoint setup
  usb: musb: tusb6010_omap: Convert to DMAengine API
  ARM: OMAP2+: DMA: Add slave map entries for 24xx external request lines
  usb: musb: tusb6010: Handle DMA TX completion in DMA callback as well
  usb: musb: tusb6010_omap: Allocate DMA channels upfront
  usb: musb: tusb6010_omap: Create new struct for DMA data/parameters
  usb: musb: tusb6010_omap: Use one musb_ep_select call in tusb_omap_dma_program
  usb: musb: tusb6010: Add MUSB_G_NO_SKB_RESERVE to quirks
  usb: musb: Add quirk to avoid skb reserve in gadget mode
  ...

4 files changed, 118 insertions, 46 deletions

diff --git a/tools/usb/testusb.c b/tools/usb/testusb.c
index 0692d99b6d8f..2d89b5f686b1 100644
--- a/tools/usb/testusb.c
+++ b/tools/usb/testusb.c
@@ -387,15 +387,17 @@ int main (int argc, char **argv)
         /* pick defaults that works with all speeds, without short packets.
          *
          * Best per-frame data rates:
-         *     high speed, bulk       512 * 13 * 8 = 53248
-         *                 interrupt 1024 *  3 * 8 = 24576
-         *     full speed, bulk/intr   64 * 19     =  1216
-         *                 interrupt   64 *  1     =    64
-         *      low speed, interrupt    8 *  1     =     8
+         *     super speed,bulk      1024 * 16 * 8 = 131072
+         *                 interrupt 1024 *  3 * 8 =  24576
+         *     high speed, bulk       512 * 13 * 8 =  53248
+         *                 interrupt 1024 *  3 * 8 =  24576
+         *     full speed, bulk/intr   64 * 19     =   1216
+         *                 interrupt   64 *  1     =     64
+         *      low speed, interrupt    8 *  1     =      8
          */
         param.iterations = 1000;
         param.length = 1024;
-        param.vary = 512;
+        param.vary = 1024;
         param.sglen = 32;
 
         /* for easy use when hotplugging */
@@ -457,7 +459,7 @@ usage:
                         "\t-c iterations                default 1000\n"
                         "\t-s transfer length   default 1024\n"
                         "\t-g sglen             default 32\n"
-                        "\t-v vary                      default 512\n",
+                        "\t-v vary                      default 1024\n",
                         argv[0]);
                 return 1;
         }
diff --git a/tools/usb/usbip/libsrc/vhci_driver.c b/tools/usb/usbip/libsrc/vhci_driver.c
index f659c146cdc8..9bd2cd71645d 100644
--- a/tools/usb/usbip/libsrc/vhci_driver.c
+++ b/tools/usb/usbip/libsrc/vhci_driver.c
@@ -7,6 +7,7 @@
 #include <limits.h>
 #include <netdb.h>
 #include <libudev.h>
+#include <dirent.h>
 #include "sysfs_utils.h"
 
 #undef  PROGNAME
@@ -35,18 +36,11 @@ err:
         return NULL;
 }
 
-
-
 static int parse_status(const char *value)
 {
         int ret = 0;
         char *c;
 
-
-        for (int i = 0; i < vhci_driver->nports; i++)
-                memset(&vhci_driver->idev[i], 0, sizeof(vhci_driver->idev[i]));
-
-
         /* skip a header line */
         c = strchr(value, '\n');
         if (!c)
@@ -57,9 +51,11 @@ static int parse_status(const char *value)
                 int port, status, speed, devid;
                 unsigned long socket;
                 char lbusid[SYSFS_BUS_ID_SIZE];
+                struct usbip_imported_device *idev;
+                char hub[3];
 
-                ret = sscanf(c, "%d %d %d %x %lx %31s\n",
-                                &port, &status, &speed,
+                ret = sscanf(c, "%2s  %d %d %d %x %lx %31s\n",
+                                hub, &port, &status, &speed,
                                 &devid, &socket, lbusid);
 
                 if (ret < 5) {
@@ -67,34 +63,36 @@ static int parse_status(const char *value)
                         BUG();
                 }
 
-                dbg("port %d status %d speed %d devid %x",
-                                port, status, speed, devid);
+                dbg("hub %s port %d status %d speed %d devid %x",
+                                hub, port, status, speed, devid);
                 dbg("socket %lx lbusid %s", socket, lbusid);
 
-
                 /* if a device is connected, look at it */
-                {
-                        struct usbip_imported_device *idev = &vhci_driver->idev[port];
+                idev = &vhci_driver->idev[port];
+                memset(idev, 0, sizeof(*idev));
+
+                if (strncmp("hs", hub, 2) == 0)
+                        idev->hub = HUB_SPEED_HIGH;
+                else /* strncmp("ss", hub, 2) == 0 */
+                        idev->hub = HUB_SPEED_SUPER;
 
-                        idev->port      = port;
-                        idev->status    = status;
+                idev->port      = port;
+                idev->status    = status;
 
-                        idev->devid     = devid;
+                idev->devid     = devid;
 
-                        idev->busnum    = (devid >> 16);
-                        idev->devnum    = (devid & 0x0000ffff);
+                idev->busnum    = (devid >> 16);
+                idev->devnum    = (devid & 0x0000ffff);
 
-                        if (idev->status != VDEV_ST_NULL
-                            && idev->status != VDEV_ST_NOTASSIGNED) {
-                                idev = imported_device_init(idev, lbusid);
-                                if (!idev) {
-                                        dbg("imported_device_init failed");
-                                        return -1;
-                                }
+                if (idev->status != VDEV_ST_NULL
+                    && idev->status != VDEV_ST_NOTASSIGNED) {
+                        idev = imported_device_init(idev, lbusid);
+                        if (!idev) {
+                                dbg("imported_device_init failed");
+                                return -1;
                         }
                 }
 
-
                 /* go to the next line */
                 c = strchr(c, '\n');
                 if (!c)
@@ -107,18 +105,33 @@ static int parse_status(const char *value)
         return 0;
 }
 
+#define MAX_STATUS_NAME 16
+
 static int refresh_imported_device_list(void)
 {
         const char *attr_status;
+        char status[MAX_STATUS_NAME+1] = "status";
+        int i, ret;
 
-        attr_status = udev_device_get_sysattr_value(vhci_driver->hc_device,
-                                               "status");
-        if (!attr_status) {
-                err("udev_device_get_sysattr_value failed");
-                return -1;
+        for (i = 0; i < vhci_driver->ncontrollers; i++) {
+                if (i > 0)
+                        snprintf(status, sizeof(status), "status.%d", i);
+
+                attr_status = udev_device_get_sysattr_value(vhci_driver->hc_device,
+                                                            status);
+                if (!attr_status) {
+                        err("udev_device_get_sysattr_value failed");
+                        return -1;
+                }
+
+                dbg("controller %d", i);
+
+                ret = parse_status(attr_status);
+                if (ret != 0)
+                        return ret;
         }
 
-        return parse_status(attr_status);
+        return 0;
 }
 
 static int get_nports(void)
@@ -134,6 +147,33 @@ static int get_nports(void)
         return (int)strtoul(attr_nports, NULL, 10);
 }
 
+static int vhci_hcd_filter(const struct dirent *dirent)
+{
+        return strcmp(dirent->d_name, "vhci_hcd") >= 0;
+}
+
+static int get_ncontrollers(void)
+{
+        struct dirent **namelist;
+        struct udev_device *platform;
+        int n;
+
+        platform = udev_device_get_parent(vhci_driver->hc_device);
+        if (platform == NULL)
+                return -1;
+
+        n = scandir(udev_device_get_syspath(platform), &namelist, vhci_hcd_filter, NULL);
+        if (n < 0)
+                err("scandir failed");
+        else {
+                for (int i = 0; i < n; i++)
+                        free(namelist[i]);
+                free(namelist);
+        }
+
+        return n;
+}
+
 /*
  * Read the given port's record.
  *
@@ -213,16 +253,31 @@ int usbip_vhci_driver_open(void)
         vhci_driver->hc_device =
                 udev_device_new_from_subsystem_sysname(udev_context,
                                                        USBIP_VHCI_BUS_TYPE,
-                                                       USBIP_VHCI_DRV_NAME);
+                                                       USBIP_VHCI_DEVICE_NAME);
         if (!vhci_driver->hc_device) {
                 err("udev_device_new_from_subsystem_sysname failed");
                 goto err;
         }
 
         vhci_driver->nports = get_nports();
-
         dbg("available ports: %d", vhci_driver->nports);
 
+        if (vhci_driver->nports <= 0) {
+                err("no available ports");
+                goto err;
+        } else if (vhci_driver->nports > MAXNPORT) {
+                err("port number exceeds %d", MAXNPORT);
+                goto err;
+        }
+
+        vhci_driver->ncontrollers = get_ncontrollers();
+        dbg("available controllers: %d", vhci_driver->ncontrollers);
+
+        if (vhci_driver->ncontrollers <=0) {
+                err("no available usb controllers");
+                goto err;
+        }
+
         if (refresh_imported_device_list())
                 goto err;
 
@@ -270,11 +325,15 @@ err:
 }
 
 
-int usbip_vhci_get_free_port(void)
+int usbip_vhci_get_free_port(uint32_t speed)
 {
         for (int i = 0; i < vhci_driver->nports; i++) {
+                if (speed == USB_SPEED_SUPER &&
+                    vhci_driver->idev[i].hub != HUB_SPEED_SUPER)
+                        continue;
+
                 if (vhci_driver->idev[i].status == VDEV_ST_NULL)
-                        return i;
+                        return vhci_driver->idev[i].port;
         }
 
         return -1;
diff --git a/tools/usb/usbip/libsrc/vhci_driver.h b/tools/usb/usbip/libsrc/vhci_driver.h
index fa2316cf2cac..4898d3bafb10 100644
--- a/tools/usb/usbip/libsrc/vhci_driver.h
+++ b/tools/usb/usbip/libsrc/vhci_driver.h
@@ -11,9 +11,16 @@
 #include "usbip_common.h"
 
 #define USBIP_VHCI_BUS_TYPE "platform"
+#define USBIP_VHCI_DEVICE_NAME "vhci_hcd.0"
 #define MAXNPORT 128
 
+enum hub_speed {
+        HUB_SPEED_HIGH = 0,
+        HUB_SPEED_SUPER,
+};
+
 struct usbip_imported_device {
+        enum hub_speed hub;
         uint8_t port;
         uint32_t status;
 
@@ -31,6 +38,7 @@ struct usbip_vhci_driver {
         /* /sys/devices/platform/vhci_hcd */
         struct udev_device *hc_device;
 
+        int ncontrollers;
         int nports;
         struct usbip_imported_device idev[MAXNPORT];
 };
@@ -44,7 +52,7 @@ void usbip_vhci_driver_close(void);
 int  usbip_vhci_refresh_device_list(void);
 
 
-int usbip_vhci_get_free_port(void);
+int usbip_vhci_get_free_port(uint32_t speed);
 int usbip_vhci_attach_device2(uint8_t port, int sockfd, uint32_t devid,
                 uint32_t speed);
 
diff --git a/tools/usb/usbip/src/usbip_attach.c b/tools/usb/usbip/src/usbip_attach.c
index 70a6b507fb62..6e89768ffe30 100644
--- a/tools/usb/usbip/src/usbip_attach.c
+++ b/tools/usb/usbip/src/usbip_attach.c
@@ -94,6 +94,7 @@ static int import_device(int sockfd, struct usbip_usb_device *udev)
 {
         int rc;
         int port;
+        uint32_t speed = udev->speed;
 
         rc = usbip_vhci_driver_open();
         if (rc < 0) {
@@ -101,13 +102,15 @@ static int import_device(int sockfd, struct usbip_usb_device *udev)
                 return -1;
         }
 
-        port = usbip_vhci_get_free_port();
+        port = usbip_vhci_get_free_port(speed);
         if (port < 0) {
                 err("no free port");
                 usbip_vhci_driver_close();
                 return -1;
         }
 
+        dbg("got free port %d", port);
+
         rc = usbip_vhci_attach_device(port, sockfd, udev->busnum,
                                       udev->devnum, udev->speed);
         if (rc < 0) {