lkml.org 
[lkml]   [2013]   [Apr]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 063/171 ] USB: xhci - fix bit definitions for IMAN register
    3.6.11.2 stable review patch.
    If anyone has any objections, please let me know.

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

    From: Dmitry Torokhov <dtor@vmware.com>

    [ Upstream commit f8264340e694604863255cc0276491d17c402390 ]

    According to XHCI specification (5.5.2.1) the IP is bit 0 and IE is bit 1
    of IMAN register. Previously their definitions were reversed.

    Even though there are no ill effects being observed from the swapped
    definitions (because IMAN_IP is RW1C and in legacy PCI case we come in
    with it already set to 1 so it was clearing itself even though we were
    setting IMAN_IE instead of IMAN_IP), we should still correct the values.

    This patch should be backported to kernels as old as 2.6.36, that
    contain the commit 4e833c0b87a30798e67f06120cecebef6ee9644c "xhci: don't
    re-enable IE constantly".

    Signed-off-by: Dmitry Torokhov <dtor@vmware.com>
    Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
    Cc: stable@vger.kernel.org
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    ---
    drivers/usb/host/xhci.h | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
    index 53df4e7..7c75bfe 100644
    --- a/drivers/usb/host/xhci.h
    +++ b/drivers/usb/host/xhci.h
    @@ -206,8 +206,8 @@ struct xhci_op_regs {
    /* bits 12:31 are reserved (and should be preserved on writes). */

    /* IMAN - Interrupt Management Register */
    -#define IMAN_IP (1 << 1)
    -#define IMAN_IE (1 << 0)
    +#define IMAN_IE (1 << 1)
    +#define IMAN_IP (1 << 0)

    /* USBSTS - USB status - status bitmasks */
    /* HC not running - set to 1 when run/stop bit is cleared. */
    --
    1.7.10.4



    \
     
     \ /
      Last update: 2013-04-11 23:41    [W:4.085 / U:0.316 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site