Merge branch 'perf/urgent' into perf/core

Conflicts:
	tools/perf/builtin-record.c
	tools/perf/builtin-top.c
	tools/perf/perf.h
	tools/perf/util/top.h

Merge reason: resolve these cherry-picking conflicts.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

7 files changed, 61 insertions, 15 deletions

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 91413cac97be..353cdd488b93 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -130,7 +130,7 @@ config USB_FSL_MPH_DR_OF
         tristate
 
 config USB_EHCI_FSL
-        bool "Support for Freescale on-chip EHCI USB controller"
+        bool "Support for Freescale PPC on-chip EHCI USB controller"
         depends on USB_EHCI_HCD && FSL_SOC
         select USB_EHCI_ROOT_HUB_TT
         select USB_FSL_MPH_DR_OF if OF
@@ -138,7 +138,7 @@ config USB_EHCI_FSL
           Variation of ARC USB block used in some Freescale chips.
 
 config USB_EHCI_MXC
-        bool "Support for Freescale on-chip EHCI USB controller"
+        bool "Support for Freescale i.MX on-chip EHCI USB controller"
         depends on USB_EHCI_HCD && ARCH_MXC
         select USB_EHCI_ROOT_HUB_TT
         ---help---
@@ -546,7 +546,7 @@ config USB_RENESAS_USBHS_HCD
 config USB_WHCI_HCD
         tristate "Wireless USB Host Controller Interface (WHCI) driver (EXPERIMENTAL)"
         depends on EXPERIMENTAL
-        depends on PCI && USB
+        depends on PCI && USB && UWB
         select USB_WUSB
         select UWB_WHCI
         help
@@ -559,7 +559,7 @@ config USB_WHCI_HCD
 config USB_HWA_HCD
         tristate "Host Wire Adapter (HWA) driver (EXPERIMENTAL)"
         depends on EXPERIMENTAL
-        depends on USB
+        depends on USB && UWB
         select USB_WUSB
         select UWB_HWA
         help
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index b556a72264d1..c26a82e83f6e 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -239,7 +239,7 @@ static void ehci_fsl_setup_phy(struct ehci_hcd *ehci,
         ehci_writel(ehci, portsc, &ehci->regs->port_status[port_offset]);
 }
 
-static void ehci_fsl_usb_setup(struct ehci_hcd *ehci)
+static int ehci_fsl_usb_setup(struct ehci_hcd *ehci)
 {
         struct usb_hcd *hcd = ehci_to_hcd(ehci);
         struct fsl_usb2_platform_data *pdata;
@@ -299,12 +299,19 @@ static void ehci_fsl_usb_setup(struct ehci_hcd *ehci)
 #endif
                 out_be32(non_ehci + FSL_SOC_USB_SICTRL, 0x00000001);
         }
+
+        if (!(in_be32(non_ehci + FSL_SOC_USB_CTRL) & CTRL_PHY_CLK_VALID)) {
+                printk(KERN_WARNING "fsl-ehci: USB PHY clock invalid\n");
+                return -ENODEV;
+        }
+        return 0;
 }
 
 /* called after powerup, by probe or system-pm "wakeup" */
 static int ehci_fsl_reinit(struct ehci_hcd *ehci)
 {
-        ehci_fsl_usb_setup(ehci);
+        if (ehci_fsl_usb_setup(ehci))
+                return -ENODEV;
         ehci_port_power(ehci, 0);
 
         return 0;
diff --git a/drivers/usb/host/ehci-fsl.h b/drivers/usb/host/ehci-fsl.h
index 491806221165..bdf43e2adc51 100644
--- a/drivers/usb/host/ehci-fsl.h
+++ b/drivers/usb/host/ehci-fsl.h
@@ -45,5 +45,6 @@
 #define FSL_SOC_USB_PRICTRL     0x40c   /* NOTE: big-endian */
 #define FSL_SOC_USB_SICTRL      0x410   /* NOTE: big-endian */
 #define FSL_SOC_USB_CTRL        0x500   /* NOTE: big-endian */
+#define CTRL_PHY_CLK_VALID      (1 << 17)
 #define SNOOP_SIZE_2GB          0x1e
 #endif                          /* _EHCI_FSL_H */
diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index caf87428ca43..7732d69e49e0 100644
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -867,6 +867,22 @@ hc_init:
 
 static void __devinit quirk_usb_early_handoff(struct pci_dev *pdev)
 {
+        /* Skip Netlogic mips SoC's internal PCI USB controller.
+         * This device does not need/support EHCI/OHCI handoff
+         */
+        if (pdev->vendor == 0x184e)     /* vendor Netlogic */
+                return;
+        if (pdev->class != PCI_CLASS_SERIAL_USB_UHCI &&
+                        pdev->class != PCI_CLASS_SERIAL_USB_OHCI &&
+                        pdev->class != PCI_CLASS_SERIAL_USB_EHCI &&
+                        pdev->class != PCI_CLASS_SERIAL_USB_XHCI)
+                return;
+
+        if (pci_enable_device(pdev) < 0) {
+                dev_warn(&pdev->dev, "Can't enable PCI device, "
+                                "BIOS handoff failed.\n");
+                return;
+        }
         if (pdev->class == PCI_CLASS_SERIAL_USB_UHCI)
                 quirk_usb_handoff_uhci(pdev);
         else if (pdev->class == PCI_CLASS_SERIAL_USB_OHCI)
@@ -875,5 +891,6 @@ static void __devinit quirk_usb_early_handoff(struct pci_dev *pdev)
                 quirk_usb_disable_ehci(pdev);
         else if (pdev->class == PCI_CLASS_SERIAL_USB_XHCI)
                 quirk_usb_handoff_xhci(pdev);
+        pci_disable_device(pdev);
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);
diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index 35e257f79c7b..557b6f32db86 100644
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -93,7 +93,7 @@ static void xhci_usb2_hub_descriptor(struct usb_hcd *hcd, struct xhci_hcd *xhci,
          */
         memset(port_removable, 0, sizeof(port_removable));
         for (i = 0; i < ports; i++) {
-                portsc = xhci_readl(xhci, xhci->usb3_ports[i]);
+                portsc = xhci_readl(xhci, xhci->usb2_ports[i]);
                 /* If a device is removable, PORTSC reports a 0, same as in the
                  * hub descriptor DeviceRemovable bits.
                  */
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index 36cbe2226a44..383fc857491c 100644
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -1126,26 +1126,42 @@ static unsigned int xhci_parse_exponent_interval(struct usb_device *udev,
 }
 
 /*
- * Convert bInterval expressed in frames (in 1-255 range) to exponent of
+ * Convert bInterval expressed in microframes (in 1-255 range) to exponent of
  * microframes, rounded down to nearest power of 2.
  */
-static unsigned int xhci_parse_frame_interval(struct usb_device *udev,
-                struct usb_host_endpoint *ep)
+static unsigned int xhci_microframes_to_exponent(struct usb_device *udev,
+                struct usb_host_endpoint *ep, unsigned int desc_interval,
+                unsigned int min_exponent, unsigned int max_exponent)
 {
         unsigned int interval;
 
-        interval = fls(8 * ep->desc.bInterval) - 1;
-        interval = clamp_val(interval, 3, 10);
-        if ((1 << interval) != 8 * ep->desc.bInterval)
+        interval = fls(desc_interval) - 1;
+        interval = clamp_val(interval, min_exponent, max_exponent);
+        if ((1 << interval) != desc_interval)
                 dev_warn(&udev->dev,
                          "ep %#x - rounding interval to %d microframes, ep desc says %d microframes\n",
                          ep->desc.bEndpointAddress,
                          1 << interval,
-                         8 * ep->desc.bInterval);
+                         desc_interval);
 
         return interval;
 }
 
+static unsigned int xhci_parse_microframe_interval(struct usb_device *udev,
+                struct usb_host_endpoint *ep)
+{
+        return xhci_microframes_to_exponent(udev, ep,
+                        ep->desc.bInterval, 0, 15);
+}
+
+
+static unsigned int xhci_parse_frame_interval(struct usb_device *udev,
+                struct usb_host_endpoint *ep)
+{
+        return xhci_microframes_to_exponent(udev, ep,
+                        ep->desc.bInterval * 8, 3, 10);
+}
+
 /* Return the polling or NAK interval.
  *
  * The polling interval is expressed in "microframes".  If xHCI's Interval field
@@ -1164,7 +1180,7 @@ static unsigned int xhci_get_endpoint_interval(struct usb_device *udev,
                 /* Max NAK rate */
                 if (usb_endpoint_xfer_control(&ep->desc) ||
                     usb_endpoint_xfer_bulk(&ep->desc)) {
-                        interval = ep->desc.bInterval;
+                        interval = xhci_parse_microframe_interval(udev, ep);
                         break;
                 }
                 /* Fall through - SS and HS isoc/int have same decoding */
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 6bbe3c3a7111..c939f5fdef9e 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -352,6 +352,11 @@ static int xhci_try_enable_msi(struct usb_hcd *hcd)
                 /* hcd->irq is -1, we have MSI */
                 return 0;
 
+        if (!pdev->irq) {
+                xhci_err(xhci, "No msi-x/msi found and no IRQ in BIOS\n");
+                return -EINVAL;
+        }
+
         /* fall back to legacy interrupt*/
         ret = request_irq(pdev->irq, &usb_hcd_irq, IRQF_SHARED,
                         hcd->irq_descr, hcd);