aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/xhci-ring.c
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2012-03-15 16:37:08 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-22 16:21:40 -0700
commit7ea2dda6d5929ef7f9aca3a0543426aab98e18db (patch)
tree26106c4ba2bad921f717d6794a8c9ecc575adfef /drivers/usb/host/xhci-ring.c
parent0938664202d431745749b2c1fe7392ad0e5414ea (diff)
downloadkernel_samsung_smdk4412-7ea2dda6d5929ef7f9aca3a0543426aab98e18db.zip
kernel_samsung_smdk4412-7ea2dda6d5929ef7f9aca3a0543426aab98e18db.tar.gz
kernel_samsung_smdk4412-7ea2dda6d5929ef7f9aca3a0543426aab98e18db.tar.bz2
xhci: don't re-enable IE constantly
commit 4e833c0b87a30798e67f06120cecebef6ee9644c upstream. While we're at that, define IMAN bitfield to aid readability. The interrupt enable bit should be set once on driver init, and we shouldn't need to continually re-enable it. Commit c21599a3 introduced a read of the irq_pending register, and that allows us to preserve the state of the IE bit. Before that commit, we were blindly writing 0x3 to the register. This patch should be backported to kernels as old as 2.6.36, or ones that contain the commit c21599a36165dbc78b380846b254017a548b9de5 "USB: xhci: Reduce reads and writes of interrupter registers". Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/xhci-ring.c')
-rw-r--r--drivers/usb/host/xhci-ring.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index edcedc4..c42fdff 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -2352,7 +2352,7 @@ hw_died:
u32 irq_pending;
/* Acknowledge the PCI interrupt */
irq_pending = xhci_readl(xhci, &xhci->ir_set->irq_pending);
- irq_pending |= 0x3;
+ irq_pending |= IMAN_IP;
xhci_writel(xhci, irq_pending, &xhci->ir_set->irq_pending);
}