Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 16 Sep 2013 10:06:40 +0000 (UTC)
From:      Hans Petter Selasky <hselasky@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r255610 - stable/8/sys/dev/usb/controller
Message-ID:  <201309161006.r8GA6ek2063000@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: hselasky
Date: Mon Sep 16 10:06:40 2013
New Revision: 255610
URL: http://svnweb.freebsd.org/changeset/base/255610

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@brilliantservice.co.jp>

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

Modified: stable/8/sys/dev/usb/controller/xhci.c
==============================================================================
--- stable/8/sys/dev/usb/controller/xhci.c	Mon Sep 16 10:04:19 2013	(r255609)
+++ stable/8/sys/dev/usb/controller/xhci.c	Mon Sep 16 10:06:40 2013	(r255610)
@@ -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);
 	}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309161006.r8GA6ek2063000>