lkml.org 
[lkml]   [2017]   [Jul]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.12 11/27] xhci: Limit USB2 port wake support for AMD Promontory hosts
    Date
    4.12-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Jiahau Chang <jiahau@gmail.com>

    commit dec08194ffeccfa1cf085906b53d301930eae18f upstream.

    For AMD Promontory xHCI host, although you can disable USB 2.0 ports in
    BIOS settings, those ports will be enabled anyway after you remove a
    device on that port and re-plug it in again. It's a known limitation of
    the chip. As a workaround we can clear the PORT_WAKE_BITS.

    This will disable wake on connect, disconnect and overcurrent on
    AMD Promontory USB2 ports

    [checkpatch cleanup and commit message reword -Mathias]
    Cc: Tsai Nicholas <nicholas.tsai@amd.com>
    Signed-off-by: Jiahau Chang <Lars_Chang@asmedia.com.tw>
    Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/usb/host/xhci-hub.c | 3 +++
    drivers/usb/host/xhci-pci.c | 12 ++++++++++++
    drivers/usb/host/xhci.h | 1 +
    3 files changed, 16 insertions(+)

    --- a/drivers/usb/host/xhci-hub.c
    +++ b/drivers/usb/host/xhci-hub.c
    @@ -1461,6 +1461,9 @@ int xhci_bus_suspend(struct usb_hcd *hcd
    t2 |= PORT_WKOC_E | PORT_WKCONN_E;
    t2 &= ~PORT_WKDISC_E;
    }
    + if ((xhci->quirks & XHCI_U2_DISABLE_WAKE) &&
    + (hcd->speed < HCD_USB3))
    + t2 &= ~PORT_WAKE_BITS;
    } else
    t2 &= ~PORT_WAKE_BITS;

    --- a/drivers/usb/host/xhci-pci.c
    +++ b/drivers/usb/host/xhci-pci.c
    @@ -54,6 +54,11 @@
    #define PCI_DEVICE_ID_INTEL_APL_XHCI 0x5aa8
    #define PCI_DEVICE_ID_INTEL_DNV_XHCI 0x19d0

    +#define PCI_DEVICE_ID_AMD_PROMONTORYA_4 0x43b9
    +#define PCI_DEVICE_ID_AMD_PROMONTORYA_3 0x43ba
    +#define PCI_DEVICE_ID_AMD_PROMONTORYA_2 0x43bb
    +#define PCI_DEVICE_ID_AMD_PROMONTORYA_1 0x43bc
    +
    static const char hcd_name[] = "xhci_hcd";

    static struct hc_driver __read_mostly xhci_pci_hc_driver;
    @@ -135,6 +140,13 @@ static void xhci_pci_quirks(struct devic
    if (pdev->vendor == PCI_VENDOR_ID_AMD)
    xhci->quirks |= XHCI_TRUST_TX_LENGTH;

    + if ((pdev->vendor == PCI_VENDOR_ID_AMD) &&
    + ((pdev->device == PCI_DEVICE_ID_AMD_PROMONTORYA_4) ||
    + (pdev->device == PCI_DEVICE_ID_AMD_PROMONTORYA_3) ||
    + (pdev->device == PCI_DEVICE_ID_AMD_PROMONTORYA_2) ||
    + (pdev->device == PCI_DEVICE_ID_AMD_PROMONTORYA_1)))
    + xhci->quirks |= XHCI_U2_DISABLE_WAKE;
    +
    if (pdev->vendor == PCI_VENDOR_ID_INTEL) {
    xhci->quirks |= XHCI_LPM_SUPPORT;
    xhci->quirks |= XHCI_INTEL_HOST;
    --- a/drivers/usb/host/xhci.h
    +++ b/drivers/usb/host/xhci.h
    @@ -1819,6 +1819,7 @@ struct xhci_hcd {
    /* For controller with a broken Port Disable implementation */
    #define XHCI_BROKEN_PORT_PED (1 << 25)
    #define XHCI_LIMIT_ENDPOINT_INTERVAL_7 (1 << 26)
    +#define XHCI_U2_DISABLE_WAKE (1 << 27)

    unsigned int num_active_eps;
    unsigned int limit_active_eps;

    \
     
     \ /
      Last update: 2017-07-10 19:10    [W:7.847 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site