Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8264340 authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Sarah Sharp
Browse files

USB: xhci - fix bit definitions for IMAN register 



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 4e833c0b "xhci: don't
re-enable IE constantly".

Signed-off-by: default avatarDmitry Torokhov <dtor@vmware.com>
Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: stable@vger.kernel.org
parent 2a40f324

drivers/usb/host/xhci.h

+2 −2
Original line number Diff line number Diff line
@@ -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. */