lkml.org 
[lkml]   [2015]   [Oct]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 26/54] xhci: change xhci 1.0 only restrictions to support xhci 1.1
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

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

    From: Mathias Nyman <mathias.nyman@linux.intel.com>

    commit dca7794539eff04b786fb6907186989e5eaaa9c2 upstream.

    Some changes between xhci 0.96 and xhci 1.0 specifications forced us to
    check the hci version in code, some of these checks were implemented as
    hci_version == 1.0, which will not work with new xhci 1.1 controllers.

    xhci 1.1 behaves similar to xhci 1.0 in these cases, so change these
    checks to hci_version >= 1.0

    Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/usb/host/xhci-mem.c | 6 +++---
    drivers/usb/host/xhci-ring.c | 4 ++--
    2 files changed, 5 insertions(+), 5 deletions(-)

    --- a/drivers/usb/host/xhci-mem.c
    +++ b/drivers/usb/host/xhci-mem.c
    @@ -1473,10 +1473,10 @@ int xhci_endpoint_init(struct xhci_hcd *
    * use Event Data TRBs, and we don't chain in a link TRB on short
    * transfers, we're basically dividing by 1.
    *
    - * xHCI 1.0 specification indicates that the Average TRB Length should
    - * be set to 8 for control endpoints.
    + * xHCI 1.0 and 1.1 specification indicates that the Average TRB Length
    + * should be set to 8 for control endpoints.
    */
    - if (usb_endpoint_xfer_control(&ep->desc) && xhci->hci_version == 0x100)
    + if (usb_endpoint_xfer_control(&ep->desc) && xhci->hci_version >= 0x100)
    ep_ctx->tx_info |= cpu_to_le32(AVG_TRB_LENGTH_FOR_EP(8));
    else
    ep_ctx->tx_info |=
    --- a/drivers/usb/host/xhci-ring.c
    +++ b/drivers/usb/host/xhci-ring.c
    @@ -3511,8 +3511,8 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *
    if (start_cycle == 0)
    field |= 0x1;

    - /* xHCI 1.0 6.4.1.2.1: Transfer Type field */
    - if (xhci->hci_version == 0x100) {
    + /* xHCI 1.0/1.1 6.4.1.2.1: Transfer Type field */
    + if (xhci->hci_version >= 0x100) {
    if (urb->transfer_buffer_length > 0) {
    if (setup->bRequestType & USB_DIR_IN)
    field |= TRB_TX_TYPE(TRB_DATA_IN);



    \
     
     \ /
      Last update: 2015-10-18 05:41    [W:4.071 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site