usb: xhci: clear EINT bit in status correctly

EINT(Event Interrupt) is a write-1-to-clear type of bit in xhci
status register. It should be cleared by writing a 1. Writing 0
to this bit has no effect.

Xhci driver tries to clear this bit by writing 0 to it. This is
not the right way to go. This patch corrects this by reading the
register first, then clearing all RO/RW1C/RsvZ bits and setting
the clearing bit, and writing back the new value at last.

Xhci spec requires that software that uses EINT shall clear it
prior to clearing any IP flags in section 5.4.2. This is the
reason why this patch is CC'ed stable as well.

[old way didn't cause any issues, skip stable, send to next -Mathias]

Cc: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 643e31d08bb2df7141e20465eb3164f68b65d252..e3c785638332597cf87db5e08cf785dcbc4adbc0 100644 (file)
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -724,7 +724,7 @@ void xhci_stop(struct usb_hcd *hcd)
        xhci_dbg_trace(xhci, trace_xhci_dbg_init,
                        "// Disabling event ring interrupts");
        temp = readl(&xhci->op_regs->status);
-       writel(temp & ~STS_EINT, &xhci->op_regs->status);
+       writel((temp & ~0x1fff) | STS_EINT, &xhci->op_regs->status);
        temp = readl(&xhci->ir_set->irq_pending);
        writel(ER_IRQ_DISABLE(temp), &xhci->ir_set->irq_pending);
        xhci_print_ir_set(xhci, 0);
@@ -1057,7 +1057,7 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
 
                xhci_dbg(xhci, "// Disabling event ring interrupts\n");
                temp = readl(&xhci->op_regs->status);
-               writel(temp & ~STS_EINT, &xhci->op_regs->status);
+               writel((temp & ~0x1fff) | STS_EINT, &xhci->op_regs->status);
                temp = readl(&xhci->ir_set->irq_pending);
                writel(ER_IRQ_DISABLE(temp), &xhci->ir_set->irq_pending);
                xhci_print_ir_set(xhci, 0);