Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

* 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (205 commits)
  USB: EHCI: Remove SPARC_LEON {read,write}_be definitions from ehci.h
  USB: UHCI: Support big endian GRUSBHC HC
  sparc: add {read,write}*_be routines
  USB: UHCI: Add support for big endian descriptors
  USB: UHCI: Use ACCESS_ONCE rather than using a full compiler barrier
  USB: UHCI: Add support for big endian mmio
  usb-storage: Correct adjust_quirks to include latest flags
  usb/isp1760: Fix possible unlink problems
  usb/isp1760: Move function isp1760_endpoint_disable() within file.
  USB: remove remaining usages of hcd->state from usbcore and fix regression
  usb: musb: ux500: add configuration and build options for ux500 dma
  usb: musb: ux500: add dma glue layer for ux500
  usb: musb: ux500: add dma name for ux500
  usb: musb: ux500: add ux500 specific code for gadget side
  usb: musb: fix compile error
  usb-storage: fix up the unusual_realtek device list
  USB: gadget: f_audio: Fix invalid dereference of initdata
  EHCI: don't rescan interrupt QHs needlessly
  OHCI: fix regression caused by nVidia shutdown workaround
  USB: OTG: msm: Free VCCCX regulator even if we can't set the voltage
  ...

8 files changed, 124 insertions, 63 deletions

diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c
index 83126b03e7c..c962608b4b9 100644
--- a/drivers/usb/core/config.c
+++ b/drivers/usb/core/config.c
@@ -129,7 +129,7 @@ static void usb_parse_ss_endpoint_companion(struct device *ddev, int cfgno,
                 max_tx = ep->desc.wMaxPacketSize * (desc->bMaxBurst + 1);
         else
                 max_tx = 999999;
-        if (desc->wBytesPerInterval > max_tx) {
+        if (le16_to_cpu(desc->wBytesPerInterval) > max_tx) {
                 dev_warn(ddev, "%s endpoint with wBytesPerInterval of %d in "
                                 "config %d interface %d altsetting %d ep %d: "
                                 "setting to %d\n",
diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
index 96fdfb815f8..0149c0976e9 100644
--- a/drivers/usb/core/devices.c
+++ b/drivers/usb/core/devices.c
@@ -64,49 +64,49 @@
 /* Define ALLOW_SERIAL_NUMBER if you want to see the serial number of devices */
 #define ALLOW_SERIAL_NUMBER
 
-static const char *format_topo =
+static const char format_topo[] =
 /* T:  Bus=dd Lev=dd Prnt=dd Port=dd Cnt=dd Dev#=ddd Spd=dddd MxCh=dd */
 "\nT:  Bus=%2.2d Lev=%2.2d Prnt=%2.2d Port=%2.2d Cnt=%2.2d Dev#=%3d Spd=%-4s MxCh=%2d\n";
 
-static const char *format_string_manufacturer =
+static const char format_string_manufacturer[] =
 /* S:  Manufacturer=xxxx */
   "S:  Manufacturer=%.100s\n";
 
-static const char *format_string_product =
+static const char format_string_product[] =
 /* S:  Product=xxxx */
   "S:  Product=%.100s\n";
 
 #ifdef ALLOW_SERIAL_NUMBER
-static const char *format_string_serialnumber =
+static const char format_string_serialnumber[] =
 /* S:  SerialNumber=xxxx */
   "S:  SerialNumber=%.100s\n";
 #endif
 
-static const char *format_bandwidth =
+static const char format_bandwidth[] =
 /* B:  Alloc=ddd/ddd us (xx%), #Int=ddd, #Iso=ddd */
   "B:  Alloc=%3d/%3d us (%2d%%), #Int=%3d, #Iso=%3d\n";
 
-static const char *format_device1 =
+static const char format_device1[] =
 /* D:  Ver=xx.xx Cls=xx(sssss) Sub=xx Prot=xx MxPS=dd #Cfgs=dd */
   "D:  Ver=%2x.%02x Cls=%02x(%-5s) Sub=%02x Prot=%02x MxPS=%2d #Cfgs=%3d\n";
 
-static const char *format_device2 =
+static const char format_device2[] =
 /* P:  Vendor=xxxx ProdID=xxxx Rev=xx.xx */
   "P:  Vendor=%04x ProdID=%04x Rev=%2x.%02x\n";
 
-static const char *format_config =
+static const char format_config[] =
 /* C:  #Ifs=dd Cfg#=dd Atr=xx MPwr=dddmA */
   "C:%c #Ifs=%2d Cfg#=%2d Atr=%02x MxPwr=%3dmA\n";
 
-static const char *format_iad =
+static const char format_iad[] =
 /* A:  FirstIf#=dd IfCount=dd Cls=xx(sssss) Sub=xx Prot=xx */
   "A:  FirstIf#=%2d IfCount=%2d Cls=%02x(%-5s) Sub=%02x Prot=%02x\n";
 
-static const char *format_iface =
+static const char format_iface[] =
 /* I:  If#=dd Alt=dd #EPs=dd Cls=xx(sssss) Sub=xx Prot=xx Driver=xxxx*/
   "I:%c If#=%2d Alt=%2d #EPs=%2d Cls=%02x(%-5s) Sub=%02x Prot=%02x Driver=%s\n";
 
-static const char *format_endpt =
+static const char format_endpt[] =
 /* E:  Ad=xx(s) Atr=xx(ssss) MxPS=dddd Ivl=D?s */
   "E:  Ad=%02x(%c) Atr=%02x(%-4s) MxPS=%4d Ivl=%d%cs\n";
 
diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c
index cf6a5423de0..99458c843d6 100644
--- a/drivers/usb/core/file.c
+++ b/drivers/usb/core/file.c
@@ -236,13 +236,6 @@ EXPORT_SYMBOL_GPL(usb_register_dev);
 void usb_deregister_dev(struct usb_interface *intf,
                         struct usb_class_driver *class_driver)
 {
-        int minor_base = class_driver->minor_base;
-        char name[20];
-
-#ifdef CONFIG_USB_DYNAMIC_MINORS
-        minor_base = 0;
-#endif
-
         if (intf->minor == -1)
                 return;
 
@@ -252,7 +245,6 @@ void usb_deregister_dev(struct usb_interface *intf,
         usb_minors[intf->minor] = NULL;
         up_write(&minor_rwsem);
 
-        snprintf(name, sizeof(name), class_driver->name, intf->minor - minor_base);
         device_destroy(usb_class->class, MKDEV(USB_MAJOR, intf->minor));
         intf->usb_dev = NULL;
         intf->minor = -1;
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 77a7faec8d7..ace9f8442e5 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -986,7 +986,7 @@ static int register_root_hub(struct usb_hcd *hcd)
                 spin_unlock_irq (&hcd_root_hub_lock);
 
                 /* Did the HC die before the root hub was registered? */
-                if (HCD_DEAD(hcd) || hcd->state == HC_STATE_HALT)
+                if (HCD_DEAD(hcd))
                         usb_hc_died (hcd);      /* This time clean up */
         }
 
@@ -2128,9 +2128,6 @@ irqreturn_t usb_hcd_irq (int irq, void *__hcd)
                 set_bit(HCD_FLAG_SAW_IRQ, &hcd->flags);
                 if (hcd->shared_hcd)
                         set_bit(HCD_FLAG_SAW_IRQ, &hcd->shared_hcd->flags);
-
-                if (unlikely(hcd->state == HC_STATE_HALT))
-                        usb_hc_died(hcd);
                 rc = IRQ_HANDLED;
         }
 
@@ -2407,6 +2404,7 @@ int usb_add_hcd(struct usb_hcd *hcd,
                 rhdev->speed = USB_SPEED_SUPER;
                 break;
         default:
+                retval = -EINVAL;
                 goto err_set_rh_speed;
         }
 
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 93720bdc9ef..79a58c3a2e2 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -379,15 +379,6 @@ static int hub_port_status(struct usb_hub *hub, int port1,
                 *status = le16_to_cpu(hub->status->port.wPortStatus);
                 *change = le16_to_cpu(hub->status->port.wPortChange);
 
-                if ((hub->hdev->parent != NULL) &&
-                                hub_is_superspeed(hub->hdev)) {
-                        /* Translate the USB 3 port status */
-                        u16 tmp = *status & USB_SS_PORT_STAT_MASK;
-                        if (*status & USB_SS_PORT_STAT_POWER)
-                                tmp |= USB_PORT_STAT_POWER;
-                        *status = tmp;
-                }
-
                 ret = 0;
         }
         mutex_unlock(&hub->status_mutex);
@@ -2160,11 +2151,76 @@ static int hub_port_reset(struct usb_hub *hub, int port1,
         return status;
 }
 
+/* Warm reset a USB3 protocol port */
+static int hub_port_warm_reset(struct usb_hub *hub, int port)
+{
+        int ret;
+        u16 portstatus, portchange;
+
+        if (!hub_is_superspeed(hub->hdev)) {
+                dev_err(hub->intfdev, "only USB3 hub support warm reset\n");
+                return -EINVAL;
+        }
+
+        /* Warm reset the port */
+        ret = set_port_feature(hub->hdev,
+                                port, USB_PORT_FEAT_BH_PORT_RESET);
+        if (ret) {
+                dev_err(hub->intfdev, "cannot warm reset port %d\n", port);
+                return ret;
+        }
+
+        msleep(20);
+        ret = hub_port_status(hub, port, &portstatus, &portchange);
+
+        if (portchange & USB_PORT_STAT_C_RESET)
+                clear_port_feature(hub->hdev, port, USB_PORT_FEAT_C_RESET);
+
+        if (portchange & USB_PORT_STAT_C_BH_RESET)
+                clear_port_feature(hub->hdev, port,
+                                        USB_PORT_FEAT_C_BH_PORT_RESET);
+
+        if (portchange & USB_PORT_STAT_C_LINK_STATE)
+                clear_port_feature(hub->hdev, port,
+                                        USB_PORT_FEAT_C_PORT_LINK_STATE);
+
+        return ret;
+}
+
+/* Check if a port is power on */
+static int port_is_power_on(struct usb_hub *hub, unsigned portstatus)
+{
+        int ret = 0;
+
+        if (hub_is_superspeed(hub->hdev)) {
+                if (portstatus & USB_SS_PORT_STAT_POWER)
+                        ret = 1;
+        } else {
+                if (portstatus & USB_PORT_STAT_POWER)
+                        ret = 1;
+        }
+
+        return ret;
+}
+
 #ifdef  CONFIG_PM
 
-#define MASK_BITS       (USB_PORT_STAT_POWER | USB_PORT_STAT_CONNECTION | \
-                                USB_PORT_STAT_SUSPEND)
-#define WANT_BITS       (USB_PORT_STAT_POWER | USB_PORT_STAT_CONNECTION)
+/* Check if a port is suspended(USB2.0 port) or in U3 state(USB3.0 port) */
+static int port_is_suspended(struct usb_hub *hub, unsigned portstatus)
+{
+        int ret = 0;
+
+        if (hub_is_superspeed(hub->hdev)) {
+                if ((portstatus & USB_PORT_STAT_LINK_STATE)
+                                == USB_SS_PORT_LS_U3)
+                        ret = 1;
+        } else {
+                if (portstatus & USB_PORT_STAT_SUSPEND)
+                        ret = 1;
+        }
+
+        return ret;
+}
 
 /* Determine whether the device on a port is ready for a normal resume,
  * is ready for a reset-resume, or should be disconnected.
@@ -2174,7 +2230,9 @@ static int check_port_resume_type(struct usb_device *udev,
                 int status, unsigned portchange, unsigned portstatus)
 {
         /* Is the device still present? */
-        if (status || (portstatus & MASK_BITS) != WANT_BITS) {
+        if (status || port_is_suspended(hub, portstatus) ||
+                        !port_is_power_on(hub, portstatus) ||
+                        !(portstatus & USB_PORT_STAT_CONNECTION)) {
                 if (status >= 0)
                         status = -ENODEV;
         }
@@ -2285,14 +2343,10 @@ int usb_port_suspend(struct usb_device *udev, pm_message_t msg)
         }
 
         /* see 7.1.7.6 */
-        /* Clear PORT_POWER if it's a USB3.0 device connected to USB 3.0
-         * external hub.
-         * FIXME: this is a temporary workaround to make the system able
-         * to suspend/resume.
-         */
-        if ((hub->hdev->parent != NULL) && hub_is_superspeed(hub->hdev))
-                status = clear_port_feature(hub->hdev, port1,
-                                                USB_PORT_FEAT_POWER);
+        if (hub_is_superspeed(hub->hdev))
+                status = set_port_feature(hub->hdev,
+                                port1 | (USB_SS_PORT_LS_U3 << 3),
+                                USB_PORT_FEAT_LINK_STATE);
         else
                 status = set_port_feature(hub->hdev, port1,
                                                 USB_PORT_FEAT_SUSPEND);
@@ -2439,7 +2493,7 @@ int usb_port_resume(struct usb_device *udev, pm_message_t msg)
 
         /* Skip the initial Clear-Suspend step for a remote wakeup */
         status = hub_port_status(hub, port1, &portstatus, &portchange);
-        if (status == 0 && !(portstatus & USB_PORT_STAT_SUSPEND))
+        if (status == 0 && !port_is_suspended(hub, portstatus))
                 goto SuspendCleared;
 
         // dev_dbg(hub->intfdev, "resume port %d\n", port1);
@@ -2447,8 +2501,13 @@ int usb_port_resume(struct usb_device *udev, pm_message_t msg)
         set_bit(port1, hub->busy_bits);
 
         /* see 7.1.7.7; affects power usage, but not budgeting */
-        status = clear_port_feature(hub->hdev,
-                        port1, USB_PORT_FEAT_SUSPEND);
+        if (hub_is_superspeed(hub->hdev))
+                status = set_port_feature(hub->hdev,
+                                port1 | (USB_SS_PORT_LS_U0 << 3),
+                                USB_PORT_FEAT_LINK_STATE);
+        else
+                status = clear_port_feature(hub->hdev,
+                                port1, USB_PORT_FEAT_SUSPEND);
         if (status) {
                 dev_dbg(hub->intfdev, "can't resume port %d, status %d\n",
                                 port1, status);
@@ -2470,9 +2529,15 @@ int usb_port_resume(struct usb_device *udev, pm_message_t msg)
 
  SuspendCleared:
         if (status == 0) {
-                if (portchange & USB_PORT_STAT_C_SUSPEND)
-                        clear_port_feature(hub->hdev, port1,
-                                        USB_PORT_FEAT_C_SUSPEND);
+                if (hub_is_superspeed(hub->hdev)) {
+                        if (portchange & USB_PORT_STAT_C_LINK_STATE)
+                                clear_port_feature(hub->hdev, port1,
+                                        USB_PORT_FEAT_C_PORT_LINK_STATE);
+                } else {
+                        if (portchange & USB_PORT_STAT_C_SUSPEND)
+                                clear_port_feature(hub->hdev, port1,
+                                                USB_PORT_FEAT_C_SUSPEND);
+                }
         }
 
         clear_bit(port1, hub->busy_bits);
@@ -3147,7 +3212,7 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
 
                 /* maybe switch power back on (e.g. root hub was reset) */
                 if ((wHubCharacteristics & HUB_CHAR_LPSM) < 2
-                                && !(portstatus & USB_PORT_STAT_POWER))
+                                && !port_is_power_on(hub, portstatus))
                         set_port_feature(hdev, port1, USB_PORT_FEAT_POWER);
 
                 if (portstatus & USB_PORT_STAT_ENABLE)
@@ -3490,6 +3555,16 @@ static void hub_events(void)
                                                 USB_PORT_FEAT_C_PORT_CONFIG_ERROR);
                         }
 
+                        /* Warm reset a USB3 protocol port if it's in
+                         * SS.Inactive state.
+                         */
+                        if (hub_is_superspeed(hub->hdev) &&
+                                (portstatus & USB_PORT_STAT_LINK_STATE)
+                                        == USB_SS_PORT_LS_SS_INACTIVE) {
+                                dev_dbg(hub_dev, "warm reset port %d\n", i);
+                                hub_port_warm_reset(hub, i);
+                        }
+
                         if (connect_change)
                                 hub_port_connect_change(hub, i,
                                                 portstatus, portchange);
diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
index 6781c369ce2..cf05b97693e 100644
--- a/drivers/usb/core/sysfs.c
+++ b/drivers/usb/core/sysfs.c
@@ -842,22 +842,19 @@ const struct attribute_group *usb_interface_groups[] = {
         NULL
 };
 
-int usb_create_sysfs_intf_files(struct usb_interface *intf)
+void usb_create_sysfs_intf_files(struct usb_interface *intf)
 {
         struct usb_device *udev = interface_to_usbdev(intf);
         struct usb_host_interface *alt = intf->cur_altsetting;
-        int retval;
 
         if (intf->sysfs_files_created || intf->unregistering)
-                return 0;
+                return;
 
-        if (alt->string == NULL &&
-                        !(udev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS))
+        if (!alt->string && !(udev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS))
                 alt->string = usb_cache_string(udev, alt->desc.iInterface);
-        if (alt->string)
-                retval = device_create_file(&intf->dev, &dev_attr_interface);
+        if (alt->string && device_create_file(&intf->dev, &dev_attr_interface))
+                ;       /* We don't actually care if the function fails. */
         intf->sysfs_files_created = 1;
-        return 0;
 }
 
 void usb_remove_sysfs_intf_files(struct usb_interface *intf)
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index d9d4b169404..8706fc97e60 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -953,8 +953,7 @@ static int usb_bus_notify(struct notifier_block *nb, unsigned long action,
                 if (dev->type == &usb_device_type)
                         (void) usb_create_sysfs_dev_files(to_usb_device(dev));
                 else if (dev->type == &usb_if_device_type)
-                        (void) usb_create_sysfs_intf_files(
-                                        to_usb_interface(dev));
+                        usb_create_sysfs_intf_files(to_usb_interface(dev));
                 break;
 
         case BUS_NOTIFY_DEL_DEVICE:
diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h
index d450b742137..d44d4b7bbf1 100644
--- a/drivers/usb/core/usb.h
+++ b/drivers/usb/core/usb.h
@@ -4,7 +4,7 @@
 
 extern int usb_create_sysfs_dev_files(struct usb_device *dev);
 extern void usb_remove_sysfs_dev_files(struct usb_device *dev);
-extern int usb_create_sysfs_intf_files(struct usb_interface *intf);
+extern void usb_create_sysfs_intf_files(struct usb_interface *intf);
 extern void usb_remove_sysfs_intf_files(struct usb_interface *intf);
 extern int usb_create_ep_devs(struct device *parent,
                                 struct usb_host_endpoint *endpoint,