| Message ID | 1430761002-9327-2-git-send-email-abrestic@chromium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Mathias, On Mon, May 4, 2015 at 10:36 AM, Andrew Bresticker <abrestic@chromium.org> wrote: > xhci_gen_setup() sets the hcd_priv field for the primary HCD, but not > for the shared HCD, requiring xHCI host-controller drivers to set it > between usb_create_shared_hcd() and usb_add_hcd(). There's no reason > xhci_gen_setup() can't set the shared HCD's hcd_priv as well, so move > that bit out of the host-controller drivers and into xhci_gen_setup(). > > Signed-off-by: Andrew Bresticker <abrestic@chromium.org> > Reviewed-by: Felipe Balbi <balbi@ti.com> > Cc: Mathias Nyman <mathias.nyman@intel.com> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Any chance you could pick this up for 4.2? It's a dependency for the xhci-tegra driver which looks like it's going to slip to 4.3 now. Thanks, Andrew
Hi On 19.05.2015 21:39, Andrew Bresticker wrote: > Hi Mathias, > > On Mon, May 4, 2015 at 10:36 AM, Andrew Bresticker > <abrestic@chromium.org> wrote: >> xhci_gen_setup() sets the hcd_priv field for the primary HCD, but not >> for the shared HCD, requiring xHCI host-controller drivers to set it >> between usb_create_shared_hcd() and usb_add_hcd(). There's no reason >> xhci_gen_setup() can't set the shared HCD's hcd_priv as well, so move >> that bit out of the host-controller drivers and into xhci_gen_setup(). >> >> Signed-off-by: Andrew Bresticker <abrestic@chromium.org> >> Reviewed-by: Felipe Balbi <balbi@ti.com> >> Cc: Mathias Nyman <mathias.nyman@intel.com> >> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > Any chance you could pick this up for 4.2? It's a dependency for the > xhci-tegra driver which looks like it's going to slip to 4.3 now. > I got some internal tasks I need(ed) to attend, and I'm a bit late with the 4.2 patches. I'll try to sort it out next week. A got some patches from Roger Quadros where he changed how struct xhci_hcd is allocated to get xhci working with OTG code. That code will conflict with patch 1/9, so patch 1/9 will probably be dropped, but that shouldn't affect the rest of your patches. -Mathias
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index 2af32e2..f9ce741 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -247,11 +247,6 @@ static int xhci_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) goto dealloc_usb2_hcd; } - /* Set the xHCI pointer before xhci_pci_setup() (aka hcd_driver.reset) - * is called by usb_add_hcd(). - */ - *((struct xhci_hcd **) xhci->shared_hcd->hcd_priv) = xhci; - retval = usb_add_hcd(xhci->shared_hcd, dev->irq, IRQF_SHARED); if (retval) diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index 783e819..852b1e9 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -147,11 +147,6 @@ static int xhci_plat_probe(struct platform_device *pdev) if ((node && of_property_read_bool(node, "usb3-lpm-capable")) || (pdata && pdata->usb3_lpm_capable)) xhci->quirks |= XHCI_LPM_SUPPORT; - /* - * Set the xHCI pointer before xhci_plat_setup() (aka hcd_driver.reset) - * is called by usb_add_hcd(). - */ - *((struct xhci_hcd **) xhci->shared_hcd->hcd_priv) = xhci; if (HCC_MAX_PSA(xhci->hcc_params) >= 4) xhci->shared_hcd->can_do_streams = 1; diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index ec8ac16..2901a67 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -4849,9 +4849,9 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks) */ hcd->has_tt = 1; } else { - /* xHCI private pointer was set in xhci_pci_probe for the second - * registered roothub. - */ + xhci = hcd_to_xhci(hcd->primary_hcd); + *((struct xhci_hcd **) hcd->hcd_priv) = xhci; + return 0; }