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

Pull USB and PHY updates from Greg KH:
 "Here is the big USB pull request for 4.18-rc1.

  Lots of stuff here, the highlights are:

   - phy driver updates and new additions

   - usual set of xhci driver updates

   - normal set of musb updates

   - gadget driver updates and new controllers

   - typec work, it's getting closer to getting fully out of the staging
     portion of the tree.

   - lots of minor cleanups and bugfixes.

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

* tag 'usb-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (263 commits)
  Revert "xhci: Reset Renesas uPD72020x USB controller for 32-bit DMA issue"
  xhci: Add quirk to zero 64bit registers on Renesas PCIe controllers
  xhci: Allow more than 32 quirks
  usb: xhci: force all memory allocations to node
  selftests: add test for USB over IP driver
  USB: typec: fsusb302: no need to check return value of debugfs_create_dir()
  USB: gadget: udc: s3c2410_udc: no need to check return value of debugfs_create functions
  USB: gadget: udc: renesas_usb3: no need to check return value of debugfs_create functions
  USB: gadget: udc: pxa27x_udc: no need to check return value of debugfs_create functions
  USB: gadget: udc: gr_udc: no need to check return value of debugfs_create functions
  USB: gadget: udc: bcm63xx_udc: no need to check return value of debugfs_create functions
  USB: udc: atmel_usba_udc: no need to check return value of debugfs_create functions
  USB: dwc3: no need to check return value of debugfs_create functions
  USB: dwc2: no need to check return value of debugfs_create functions
  USB: core: no need to check return value of debugfs_create functions
  USB: chipidea: no need to check return value of debugfs_create functions
  USB: ehci-hcd: no need to check return value of debugfs_create functions
  USB: fhci-hcd: no need to check return value of debugfs_create functions
  USB: fotg210-hcd: no need to check return value of debugfs_create functions
  USB: imx21-hcd: no need to check return value of debugfs_create functions
  ...

4 files changed, 253 insertions, 26 deletions

diff --git a/tools/testing/selftests/drivers/usb/usbip/usbip_test.sh b/tools/testing/selftests/drivers/usb/usbip/usbip_test.sh
new file mode 100755
index 000000000000..1893d0f59ad7
--- /dev/null
+++ b/tools/testing/selftests/drivers/usb/usbip/usbip_test.sh
@@ -0,0 +1,198 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
+
+# Kselftest framework requirement - SKIP code is 4.
+ksft_skip=4
+
+usage() { echo "usbip_test.sh -b <busid> -p <usbip tools path>"; exit 1; }
+
+while getopts "h:b:p:" arg; do
+    case "${arg}" in
+        h)
+            usage
+            ;;
+        b)
+            busid=${OPTARG}
+            ;;
+        p)
+            tools_path=${OPTARG}
+            ;;
+        *)
+            usage
+            ;;
+    esac
+done
+shift $((OPTIND-1))
+
+if [ -z "${busid}" ]; then
+        usage
+fi
+
+echo "Running USB over IP Testing on $busid";
+
+test_end_msg="End of USB over IP Testing on $busid"
+
+if [ $UID != 0 ]; then
+        echo "Please run usbip_test as root [SKIP]"
+        echo $test_end_msg
+        exit $ksft_skip
+fi
+
+echo "Load usbip_host module"
+if ! /sbin/modprobe -q -n usbip_host; then
+        echo "usbip_test: module usbip_host is not found [SKIP]"
+        echo $test_end_msg
+        exit $ksft_skip
+fi
+
+if /sbin/modprobe -q usbip_host; then
+        /sbin/modprobe -q -r test_bitmap
+        echo "usbip_test: module usbip_host is loaded [OK]"
+else
+        echo "usbip_test: module usbip_host failed to load [FAIL]"
+        echo $test_end_msg
+        exit 1
+fi
+
+echo "Load vhci_hcd module"
+if /sbin/modprobe -q vhci_hcd; then
+        /sbin/modprobe -q -r test_bitmap
+        echo "usbip_test: module vhci_hcd is loaded [OK]"
+else
+        echo "usbip_test: module vhci_hcd failed to load [FAIL]"
+        echo $test_end_msg
+        exit 1
+fi
+echo "=============================================================="
+
+cd $tools_path;
+
+if [ ! -f src/usbip ]; then
+        echo "Please build usbip tools"
+        echo $test_end_msg
+        exit $ksft_skip
+fi
+
+echo "Expect to see export-able devices";
+src/usbip list -l;
+echo "=============================================================="
+
+echo "Run lsusb to see all usb devices"
+lsusb -t;
+echo "=============================================================="
+
+src/usbipd -D;
+
+echo "Get exported devices from localhost - expect to see none";
+src/usbip list -r localhost;
+echo "=============================================================="
+
+echo "bind devices";
+src/usbip bind -b $busid;
+echo "=============================================================="
+
+echo "Run lsusb - bound devices should be under usbip_host control"
+lsusb -t;
+echo "=============================================================="
+
+echo "bind devices - expect already bound messages"
+src/usbip bind -b $busid;
+echo "=============================================================="
+
+echo "Get exported devices from localhost - expect to see exported devices";
+src/usbip list -r localhost;
+echo "=============================================================="
+
+echo "unbind devices";
+src/usbip unbind -b $busid;
+echo "=============================================================="
+
+echo "Run lsusb - bound devices should be rebound to original drivers"
+lsusb -t;
+echo "=============================================================="
+
+echo "unbind devices - expect no devices bound message";
+src/usbip unbind -b $busid;
+echo "=============================================================="
+
+echo "Get exported devices from localhost - expect to see none";
+src/usbip list -r localhost;
+echo "=============================================================="
+
+echo "List imported devices - expect to see none";
+src/usbip port;
+echo "=============================================================="
+
+echo "Import devices from localhost - should fail with no devices"
+src/usbip attach -r localhost -b $busid;
+echo "=============================================================="
+
+echo "bind devices";
+src/usbip bind -b $busid;
+echo "=============================================================="
+
+echo "List imported devices - expect to see exported devices";
+src/usbip list -r localhost;
+echo "=============================================================="
+
+echo "List imported devices - expect to see none";
+src/usbip port;
+echo "=============================================================="
+
+echo "Import devices from localhost - should work"
+src/usbip attach -r localhost -b $busid;
+echo "=============================================================="
+
+echo "List imported devices - expect to see imported devices";
+src/usbip port;
+echo "=============================================================="
+
+echo "Import devices from localhost - expect already imported messages"
+src/usbip attach -r localhost -b $busid;
+echo "=============================================================="
+
+echo "Un-import devices";
+src/usbip detach -p 00;
+src/usbip detach -p 01;
+echo "=============================================================="
+
+echo "List imported devices - expect to see none";
+src/usbip port;
+echo "=============================================================="
+
+echo "Un-import devices - expect no devices to detach messages";
+src/usbip detach -p 00;
+src/usbip detach -p 01;
+echo "=============================================================="
+
+echo "Detach invalid port tests - expect invalid port error message";
+src/usbip detach -p 100;
+echo "=============================================================="
+
+echo "Expect to see export-able devices";
+src/usbip list -l;
+echo "=============================================================="
+
+echo "Remove usbip_host module";
+rmmod usbip_host;
+
+echo "Run lsusb - bound devices should be rebound to original drivers"
+lsusb -t;
+echo "=============================================================="
+
+echo "Run bind without usbip_host - expect fail"
+src/usbip bind -b $busid;
+echo "=============================================================="
+
+echo "Run lsusb - devices that failed to bind aren't bound to any driver"
+lsusb -t;
+echo "=============================================================="
+
+echo "modprobe usbip_host - does it work?"
+/sbin/modprobe usbip_host
+echo "Should see -busid- is not in match_busid table... skip! dmesg"
+echo "=============================================================="
+dmesg | grep "is not in match_busid table"
+echo "=============================================================="
+
+echo $test_end_msg
diff --git a/tools/usb/usbip/libsrc/vhci_driver.c b/tools/usb/usbip/libsrc/vhci_driver.c
index c9c81614a66a..4204359c9fee 100644
--- a/tools/usb/usbip/libsrc/vhci_driver.c
+++ b/tools/usb/usbip/libsrc/vhci_driver.c
@@ -135,11 +135,11 @@ static int refresh_imported_device_list(void)
         return 0;
 }
 
-static int get_nports(void)
+static int get_nports(struct udev_device *hc_device)
 {
         const char *attr_nports;
 
-        attr_nports = udev_device_get_sysattr_value(vhci_driver->hc_device, "nports");
+        attr_nports = udev_device_get_sysattr_value(hc_device, "nports");
         if (!attr_nports) {
                 err("udev_device_get_sysattr_value nports failed");
                 return -1;
@@ -242,35 +242,41 @@ static int read_record(int rhport, char *host, unsigned long host_len,
 
 int usbip_vhci_driver_open(void)
 {
+        int nports;
+        struct udev_device *hc_device;
+
         udev_context = udev_new();
         if (!udev_context) {
                 err("udev_new failed");
                 return -1;
         }
 
-        vhci_driver = calloc(1, sizeof(struct usbip_vhci_driver));
-
         /* will be freed in usbip_driver_close() */
-        vhci_driver->hc_device =
+        hc_device =
                 udev_device_new_from_subsystem_sysname(udev_context,
                                                        USBIP_VHCI_BUS_TYPE,
                                                        USBIP_VHCI_DEVICE_NAME);
-        if (!vhci_driver->hc_device) {
+        if (!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) {
+        nports = get_nports(hc_device);
+        if (nports <= 0) {
                 err("no available ports");
                 goto err;
-        } else if (vhci_driver->nports > MAXNPORT) {
-                err("port number exceeds %d", MAXNPORT);
+        }
+        dbg("available ports: %d", nports);
+
+        vhci_driver = calloc(1, sizeof(struct usbip_vhci_driver) +
+                        nports * sizeof(struct usbip_imported_device));
+        if (!vhci_driver) {
+                err("vhci_driver allocation failed");
                 goto err;
         }
 
+        vhci_driver->nports = nports;
+        vhci_driver->hc_device = hc_device;
         vhci_driver->ncontrollers = get_ncontrollers();
         dbg("available controllers: %d", vhci_driver->ncontrollers);
 
@@ -285,7 +291,7 @@ int usbip_vhci_driver_open(void)
         return 0;
 
 err:
-        udev_device_unref(vhci_driver->hc_device);
+        udev_device_unref(hc_device);
 
         if (vhci_driver)
                 free(vhci_driver);
diff --git a/tools/usb/usbip/libsrc/vhci_driver.h b/tools/usb/usbip/libsrc/vhci_driver.h
index 418b404d5121..6c9aca216705 100644
--- a/tools/usb/usbip/libsrc/vhci_driver.h
+++ b/tools/usb/usbip/libsrc/vhci_driver.h
@@ -13,7 +13,6 @@
 
 #define USBIP_VHCI_BUS_TYPE "platform"
 #define USBIP_VHCI_DEVICE_NAME "vhci_hcd.0"
-#define MAXNPORT 128
 
 enum hub_speed {
         HUB_SPEED_HIGH = 0,
@@ -41,7 +40,7 @@ struct usbip_vhci_driver {
 
         int ncontrollers;
         int nports;
-        struct usbip_imported_device idev[MAXNPORT];
+        struct usbip_imported_device idev[];
 };
 
 
diff --git a/tools/usb/usbip/src/usbip_detach.c b/tools/usb/usbip/src/usbip_detach.c
index 9db9d21bb2ec..777f7286a0c5 100644
--- a/tools/usb/usbip/src/usbip_detach.c
+++ b/tools/usb/usbip/src/usbip_detach.c
@@ -43,9 +43,12 @@ void usbip_detach_usage(void)
 
 static int detach_port(char *port)
 {
-        int ret;
+        int ret = 0;
         uint8_t portnum;
         char path[PATH_MAX+1];
+        int i;
+        struct usbip_imported_device *idev;
+        int found = 0;
 
         unsigned int port_len = strlen(port);
 
@@ -55,27 +58,48 @@ static int detach_port(char *port)
                         return -1;
                 }
 
-        /* check max port */
-
         portnum = atoi(port);
 
-        /* remove the port state file */
+        ret = usbip_vhci_driver_open();
+        if (ret < 0) {
+                err("open vhci_driver");
+                return -1;
+        }
+
+        /* check for invalid port */
+        for (i = 0; i < vhci_driver->nports; i++) {
+                idev = &vhci_driver->idev[i];
+
+                if (idev->port == portnum) {
+                        found = 1;
+                        if (idev->status != VDEV_ST_NULL)
+                                break;
+                        info("Port %d is already detached!\n", idev->port);
+                        goto call_driver_close;
+                }
+        }
 
+        if (!found) {
+                err("Invalid port %s > maxports %d",
+                        port, vhci_driver->nports);
+                goto call_driver_close;
+        }
+
+        /* remove the port state file */
         snprintf(path, PATH_MAX, VHCI_STATE_PATH"/port%d", portnum);
 
         remove(path);
         rmdir(VHCI_STATE_PATH);
 
-        ret = usbip_vhci_driver_open();
+        ret = usbip_vhci_detach_device(portnum);
         if (ret < 0) {
-                err("open vhci_driver");
-                return -1;
+                ret = -1;
+                err("Port %d detach request failed!\n", portnum);
+                goto call_driver_close;
         }
+        info("Port %d is now detached!\n", portnum);
 
-        ret = usbip_vhci_detach_device(portnum);
-        if (ret < 0)
-                return -1;
-
+call_driver_close:
         usbip_vhci_driver_close();
 
         return ret;