[PATCH 0/1] xhci: Recognize USB 3.0 devices as superspeed at powerup

[PATCH 0/1] xhci: Recognize USB 3.0 devices as superspeed at powerup

[manoj.iyer]

From: Manoj Iyer <manoj.iyer@canonical.com>

On Intel Panther Point chipset USB 3.0 devices show up as
high-speed devices on powerup, but after an s3 cycle they are
correctly recognized as SuperSpeed. At powerup switch the port
to xHCI so that USB 3.0 devices are correctly recognized.

This is a second attempt at fixing this based on review comments
to my earlier patch from Andiry Xu

BugLink: http://bugs.launchpad.net/bugs/1000424


Test results after applying patch
==================================

USB 3.0 device connected to SuperSpeed port
--------------------------------------------
[   34.694033] usb 4-1: new SuperSpeed USB device number 2 using xhci_hcd
[   34.712925] scsi6 : usb-storage 4-1:1.0
[   35.709947] scsi 6:0:0:0: Direct-Access     JetFlash Transcend 16GB   1.00 PQ: 0 ANSI: 5
[   35.710886] sd 6:0:0:0: Attached scsi generic sg3 type 0
[   35.711475] sd 6:0:0:0: [sdc] 30871552 512-byte logical blocks: (15.8 GB/14.7 GiB)
[   35.712721] sd 6:0:0:0: [sdc] Write Protect is off
[   35.712725] sd 6:0:0:0: [sdc] Mode Sense: 23 00 00 00
[   35.712841] sd 6:0:0:0: [sdc] Write cache: disabled, read cache: disabled, doesn't support DPO or FUA
[   35.714627]  sdc: sdc1

USB 3.0 device connected to highspeed port
-------------------------------------------
[  148.128616] usb 1-1.2: new high-speed USB device number 5 using ehci_hcd
[  148.226040] scsi7 : usb-storage 1-1.2:1.0
[  149.225645] scsi 7:0:0:0: Direct-Access     JetFlash Transcend 16GB   1.00 PQ: 0 ANSI: 5
[  149.227690] sd 7:0:0:0: Attached scsi generic sg3 type 0
[  149.230196] sd 7:0:0:0: [sdc] 30871552 512-byte logical blocks: (15.8 GB/14.7 GiB)
[  149.230555] sd 7:0:0:0: [sdc] Write Protect is off
[  149.230563] sd 7:0:0:0: [sdc] Mode Sense: 23 00 00 00
[  149.231333] sd 7:0:0:0: [sdc] Write cache: disabled, read cache: disabled, doesn't support DPO or FUA
[  149.235822]  sdc: sdc1
[  149.238035] sd 7:0:0:0: [sdc] Attached SCSI removable disk


Manoj Iyer (1):
  xhci: Recognize USB 3.0 devices as superspeed at powerup

 drivers/usb/host/pci-quirks.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

-- 
1.7.9.5

[PATCH 1/1] xhci: Recognize USB 3.0 devices as superspeed at powerup

[manoj.iyer]

From: Manoj Iyer <manoj.iyer@canonical.com>

On Intel Panther Point chipset USB 3.0 devices show up as
high-speed devices on powerup, but after an s3 cycle they are
correctly recognized as SuperSpeed. At powerup switch the port
to xHCI so that USB 3.0 devices are correctly recognized.

BugLink: http://bugs.launchpad.net/bugs/1000424

Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com>
---
 drivers/usb/host/pci-quirks.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index c5e9e4a..486e812 100644
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -870,9 +870,10 @@ static void __devinit quirk_usb_handoff_xhci(struct pci_dev *pdev)
 	/* Disable any BIOS SMIs and clear all SMI events*/
 	writel(val, base + ext_cap_offset + XHCI_LEGACY_CONTROL_OFFSET);
 
+hc_init:
 	if (usb_is_intel_switchable_xhci(pdev))
 		usb_enable_xhci_ports(pdev);
-hc_init:
+
 	op_reg_base = base + XHCI_HC_LENGTH(readl(base));
 
 	/* Wait for the host controller to be ready before writing any
-- 
1.7.9.5

Re: [PATCH 1/1] xhci: Recognize USB 3.0 devices as superspeed at powerup

[Andiry Xu]

On Thu, Aug 23, 2012 at 12:53 AM,  <manoj.iyer@canonical.com> wrote:
> From: Manoj Iyer <manoj.iyer@canonical.com>
>
> On Intel Panther Point chipset USB 3.0 devices show up as
> high-speed devices on powerup, but after an s3 cycle they are
> correctly recognized as SuperSpeed. At powerup switch the port
> to xHCI so that USB 3.0 devices are correctly recognized.
>
> BugLink: http://bugs.launchpad.net/bugs/1000424
>
> Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com>

This one looks OK to me.

Thanks,
Andiry

> ---
>  drivers/usb/host/pci-quirks.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
> index c5e9e4a..486e812 100644
> --- a/drivers/usb/host/pci-quirks.c
> +++ b/drivers/usb/host/pci-quirks.c
> @@ -870,9 +870,10 @@ static void __devinit quirk_usb_handoff_xhci(struct pci_dev *pdev)
>         /* Disable any BIOS SMIs and clear all SMI events*/
>         writel(val, base + ext_cap_offset + XHCI_LEGACY_CONTROL_OFFSET);
>
> +hc_init:
>         if (usb_is_intel_switchable_xhci(pdev))
>                 usb_enable_xhci_ports(pdev);
> -hc_init:
> +
>         op_reg_base = base + XHCI_HC_LENGTH(readl(base));
>
>         /* Wait for the host controller to be ready before writing any
> --
> 1.7.9.5
>