lkml.org 
[lkml]   [2019]   [Dec]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 170/267] usb: xhci: only set D3hot for pci device
    Date
    From: Henry Lin <henryl@nvidia.com>

    commit f2c710f7dca8457e88b4ac9de2060f011254f9dd upstream.

    Xhci driver cannot call pci_set_power_state() on non-pci xhci host
    controllers. For example, NVIDIA Tegra XHCI host controller which acts
    as platform device with XHCI_SPURIOUS_WAKEUP quirk set in some platform
    hits this issue during shutdown.

    Cc: <stable@vger.kernel.org>
    Fixes: 638298dc66ea ("xhci: Fix spurious wakeups after S5 on Haswell")
    Signed-off-by: Henry Lin <henryl@nvidia.com>
    Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
    Link: https://lore.kernel.org/r/20191211142007.8847-4-mathias.nyman@linux.intel.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/usb/host/xhci-pci.c | 13 +++++++++++++
    drivers/usb/host/xhci.c | 7 ++-----
    drivers/usb/host/xhci.h | 1 +
    3 files changed, 16 insertions(+), 5 deletions(-)

    --- a/drivers/usb/host/xhci-pci.c
    +++ b/drivers/usb/host/xhci-pci.c
    @@ -499,6 +499,18 @@ static int xhci_pci_resume(struct usb_hc
    }
    #endif /* CONFIG_PM */

    +static void xhci_pci_shutdown(struct usb_hcd *hcd)
    +{
    + struct xhci_hcd *xhci = hcd_to_xhci(hcd);
    + struct pci_dev *pdev = to_pci_dev(hcd->self.controller);
    +
    + xhci_shutdown(hcd);
    +
    + /* Yet another workaround for spurious wakeups at shutdown with HSW */
    + if (xhci->quirks & XHCI_SPURIOUS_WAKEUP)
    + pci_set_power_state(pdev, PCI_D3hot);
    +}
    +
    /*-------------------------------------------------------------------------*/

    /* PCI driver selection metadata; PCI hotplugging uses this */
    @@ -534,6 +546,7 @@ static int __init xhci_pci_init(void)
    #ifdef CONFIG_PM
    xhci_pci_hc_driver.pci_suspend = xhci_pci_suspend;
    xhci_pci_hc_driver.pci_resume = xhci_pci_resume;
    + xhci_pci_hc_driver.shutdown = xhci_pci_shutdown;
    #endif
    return pci_register_driver(&xhci_pci_driver);
    }
    --- a/drivers/usb/host/xhci.c
    +++ b/drivers/usb/host/xhci.c
    @@ -717,7 +717,7 @@ static void xhci_stop(struct usb_hcd *hc
    *
    * This will only ever be called with the main usb_hcd (the USB3 roothub).
    */
    -static void xhci_shutdown(struct usb_hcd *hcd)
    +void xhci_shutdown(struct usb_hcd *hcd)
    {
    struct xhci_hcd *xhci = hcd_to_xhci(hcd);

    @@ -736,11 +736,8 @@ static void xhci_shutdown(struct usb_hcd
    xhci_dbg_trace(xhci, trace_xhci_dbg_init,
    "xhci_shutdown completed - status = %x",
    readl(&xhci->op_regs->status));
    -
    - /* Yet another workaround for spurious wakeups at shutdown with HSW */
    - if (xhci->quirks & XHCI_SPURIOUS_WAKEUP)
    - pci_set_power_state(to_pci_dev(hcd->self.sysdev), PCI_D3hot);
    }
    +EXPORT_SYMBOL_GPL(xhci_shutdown);

    #ifdef CONFIG_PM
    static void xhci_save_registers(struct xhci_hcd *xhci)
    --- a/drivers/usb/host/xhci.h
    +++ b/drivers/usb/host/xhci.h
    @@ -2022,6 +2022,7 @@ int xhci_start(struct xhci_hcd *xhci);
    int xhci_reset(struct xhci_hcd *xhci);
    int xhci_run(struct usb_hcd *hcd);
    int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks);
    +void xhci_shutdown(struct usb_hcd *hcd);
    void xhci_init_driver(struct hc_driver *drv,
    const struct xhci_driver_overrides *over);
    int xhci_disable_slot(struct xhci_hcd *xhci, u32 slot_id);

    \
     
     \ /
      Last update: 2019-12-16 18:57    [W:4.656 / U:1.872 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site