svn commit: r255356 - head/sys/dev/usb/controller
Hans Petter Selasky
hselasky at FreeBSD.org
Sat Sep 7 10:42:00 UTC 2013
Author: hselasky
Date: Sat Sep 7 10:42:00 2013
New Revision: 255356
URL: http://svnweb.freebsd.org/changeset/base/255356
Log:
Revert parts of r245132 and r245175. We don't need to write to the
IMAN register to clear the pending interrupt status bits. This patch
tries to solve problems seen on the MacBook Air, as reported by
Johannes Lundberg <johannes at brilliantservice.co.jp>
MFC after: 1 week
Modified:
head/sys/dev/usb/controller/xhci.c
Modified: head/sys/dev/usb/controller/xhci.c
==============================================================================
--- head/sys/dev/usb/controller/xhci.c Sat Sep 7 09:47:18 2013 (r255355)
+++ head/sys/dev/usb/controller/xhci.c Sat Sep 7 10:42:00 2013 (r255356)
@@ -1480,7 +1480,6 @@ void
xhci_interrupt(struct xhci_softc *sc)
{
uint32_t status;
- uint32_t iman;
USB_BUS_LOCK(&sc->sc_bus);
@@ -1495,15 +1494,6 @@ xhci_interrupt(struct xhci_softc *sc)
DPRINTFN(16, "real interrupt (status=0x%08x)\n", status);
if (status & XHCI_STS_EINT) {
-
- /* acknowledge pending event */
- iman = XREAD4(sc, runt, XHCI_IMAN(0));
-
- /* reset interrupt */
- XWRITE4(sc, runt, XHCI_IMAN(0), iman);
-
- DPRINTFN(16, "real interrupt (iman=0x%08x)\n", iman);
-
/* check for event(s) */
xhci_interrupt_poll(sc);
}
More information about the svn-src-all
mailing list