svn commit: r255609 - stable/9/sys/dev/usb/controller

[Hans Petter Selasky]

Author: hselasky
Date: Mon Sep 16 10:04:19 2013
New Revision: 255609
URL: http://svnweb.freebsd.org/changeset/base/255609

Log:
  MFC r255356:
  
  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>

Modified:
  stable/9/sys/dev/usb/controller/xhci.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/usb/controller/xhci.c
==============================================================================
--- stable/9/sys/dev/usb/controller/xhci.c	Mon Sep 16 06:25:54 2013	(r255608)
+++ stable/9/sys/dev/usb/controller/xhci.c	Mon Sep 16 10:04:19 2013	(r255609)
@@ -1446,7 +1446,6 @@ void
 xhci_interrupt(struct xhci_softc *sc)
 {
 	uint32_t status;
-	uint32_t iman;
 
 	USB_BUS_LOCK(&sc->sc_bus);
 
@@ -1461,15 +1460,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);
 	}