lkml.org 
[lkml]   [2016]   [Apr]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19.y-ckt 32/66] usb: host: xhci: add a new quirk XHCI_NO_64BIT_SUPPORT
    Date
    3.19.8-ckt20 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>

    commit 0a380be8233dbf8dd20795b801c5d5d5ef3992f7 upstream.

    On some xHCI controllers (e.g. R-Car SoCs), the AC64 bit (bit 0) of
    HCCPARAMS1 is set to 1. However, the xHCs don't support 64-bit
    address memory pointers actually. So, in this case, this driver should
    call dma_set_coherent_mask(dev, DMA_BIT_MASK(32)) in xhci_gen_setup().
    Otherwise, the xHCI controller will be died after a usb device is
    connected if it runs on above 4GB physical memory environment.

    So, this patch adds a new quirk XHCI_NO_64BIT_SUPPORT to resolve
    such an issue.

    Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
    Reviewed-by: Felipe Balbi <felipe.balbi@linux.intel.com>
    Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/usb/host/xhci.c | 10 ++++++++++
    drivers/usb/host/xhci.h | 1 +
    2 files changed, 11 insertions(+)

    diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
    index 643a9f9..af63df1 100644
    --- a/drivers/usb/host/xhci.c
    +++ b/drivers/usb/host/xhci.c
    @@ -4938,6 +4938,16 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)
    goto error;
    xhci_dbg(xhci, "Reset complete\n");

    + /*
    + * On some xHCI controllers (e.g. R-Car SoCs), the AC64 bit (bit 0)
    + * of HCCPARAMS1 is set to 1. However, the xHCs don't support 64-bit
    + * address memory pointers actually. So, this driver clears the AC64
    + * bit of xhci->hcc_params to call dma_set_coherent_mask(dev,
    + * DMA_BIT_MASK(32)) in this xhci_gen_setup().
    + */
    + if (xhci->quirks & XHCI_NO_64BIT_SUPPORT)
    + xhci->hcc_params &= ~BIT(0);
    +
    /* Set dma_mask and coherent_dma_mask to 64-bits,
    * if xHC supports 64-bit addressing */
    if (HCC_64BIT_ADDR(xhci->hcc_params) &&
    diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
    index 75281ba..3716b63 100644
    --- a/drivers/usb/host/xhci.h
    +++ b/drivers/usb/host/xhci.h
    @@ -1568,6 +1568,7 @@ struct xhci_hcd {
    /* For controllers with a broken beyond repair streams implementation */
    #define XHCI_BROKEN_STREAMS (1 << 19)
    #define XHCI_PME_STUCK_QUIRK (1 << 20)
    +#define XHCI_NO_64BIT_SUPPORT (1 << 23)
    unsigned int num_active_eps;
    unsigned int limit_active_eps;
    /* There are two roothubs to keep track of bus suspend info for */
    --
    2.7.4
    \
     
     \ /
      Last update: 2016-04-26 22:41    [W:2.147 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site