Skip to content

Commit

Permalink
USB: xhci - fix bit definitions for IMAN register
Browse files Browse the repository at this point in the history
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 4e833c0 "xhci: don't
re-enable IE constantly".

Signed-off-by: Dmitry Torokhov <[email protected]>
Signed-off-by: Sarah Sharp <[email protected]>
Cc: [email protected]
  • Loading branch information
Dmitry Torokhov authored and Sarah Sharp committed Mar 18, 2013
1 parent 2a40f32 commit f826434
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/usb/host/xhci.h
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down

0 comments on commit f826434

Please sign in to comment.