On Mon, Feb 10, 2014 at 03:02:00PM +0100, Hans de Goede wrote:
> Hi,
>
> On 02/10/2014 02:58 PM, [email protected] wrote:
> > From: Oliver Neukum <[email protected]>
> >
> > On some older XHCIs streams are not supported and the UAS driver
> > will fail at probe time. For those devices storage should try
> > to bind to UAS devices.
> > This patch adds a flag for stream support to HCDs and evaluates
> > it.
> >
> > Signed-off-by: Oliver Neukum <[email protected]>
>
> Looks good:
>
> Acked-by: Hans de Goede <[email protected]>
>
> Sarah can you add this to the bulk-stream + uas patch-series for
> 3.15 please ?
Sure. Oliver, is there a first patch or did you mean v2 instead of 2/2?
Sarah Sharp
> > ---
> > drivers/usb/host/xhci-pci.c | 3 +++
> > drivers/usb/host/xhci-plat.c | 3 +++
> > drivers/usb/storage/uas-detect.h | 4 ++++
> > include/linux/usb/hcd.h | 1 +
> > 4 files changed, 11 insertions(+)
> >
> > diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
> > index 73f5208..93d4895 100644
> > --- a/drivers/usb/host/xhci-pci.c
> > +++ b/drivers/usb/host/xhci-pci.c
> > @@ -223,6 +223,9 @@ static int xhci_pci_probe(struct pci_dev *dev, const
> > struct pci_device_id *id)
> > if (xhci->quirks & XHCI_LPM_SUPPORT)
> > hcd_to_bus(xhci->shared_hcd)->root_hub->lpm_capable = 1;
> >
> > + if (HCC_MAX_PSA(xhci->hcc_params) >= 4)
> > + hcd->can_do_streams = 1;
> > +
> > return 0;
> >
> > put_usb3_hcd:
> > diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
> > index d9c169f..6e328ec 100644
> > --- a/drivers/usb/host/xhci-plat.c
> > +++ b/drivers/usb/host/xhci-plat.c
> > @@ -156,6 +156,9 @@ static int xhci_plat_probe(struct platform_device *pdev)
> > */
> > *((struct xhci_hcd **) xhci->shared_hcd->hcd_priv) = xhci;
> >
> > + if (HCC_MAX_PSA(xhci->hcc_params) >=4)
> > + hcd->can_do_streams = 1;
> > +
> > ret = usb_add_hcd(xhci->shared_hcd, irq, IRQF_SHARED);
> > if (ret)
> > goto put_usb3_hcd;
> > diff --git a/drivers/usb/storage/uas-detect.h
> > b/drivers/usb/storage/uas-detect.h
> > index b8a02e1..bb05b98 100644
> > --- a/drivers/usb/storage/uas-detect.h
> > +++ b/drivers/usb/storage/uas-detect.h
> > @@ -72,6 +72,7 @@ static int uas_use_uas_driver(struct usb_interface *intf,
> > {
> > struct usb_host_endpoint *eps[4] = { };
> > struct usb_device *udev = interface_to_usbdev(intf);
> > + struct usb_hcd *hcd = bus_to_hcd(udev->bus);
> > unsigned long flags = id->driver_info;
> > int r, alt;
> >
> > @@ -80,6 +81,9 @@ static int uas_use_uas_driver(struct usb_interface *intf,
> > if (flags & US_FL_IGNORE_UAS)
> > return 0;
> >
> > + if (udev->speed >= USB_SPEED_SUPER && !hcd->can_do_streams)
> > + return 0;
> > +
> > alt = uas_find_uas_alt_setting(intf);
> > if (alt < 0)
> > return 0;
> > diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
> > index fc64b68..c13024f 100644
> > --- a/include/linux/usb/hcd.h
> > +++ b/include/linux/usb/hcd.h
> > @@ -142,6 +142,7 @@ struct usb_hcd {
> > unsigned authorized_default:1;
> > unsigned has_tt:1; /* Integrated TT in root hub */
> > unsigned amd_resume_bug:1; /* AMD remote wakeup quirk */
> > + unsigned can_do_streams:1; /* HC supports streams */
> >
> > unsigned int irq; /* irq allocated */
> > void __iomem *regs; /* device memory/io */
> >
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
