From owner-svn-src-all@FreeBSD.ORG Tue Jan 8 19:38:57 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C8C5A73D; Tue, 8 Jan 2013 19:38:57 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id BAADC7D0; Tue, 8 Jan 2013 19:38:57 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r08JcvlD079387; Tue, 8 Jan 2013 19:38:57 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r08JcvpD079386; Tue, 8 Jan 2013 19:38:57 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201301081938.r08JcvpD079386@svn.freebsd.org> From: Hans Petter Selasky Date: Tue, 8 Jan 2013 19:38:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r245175 - head/sys/dev/usb/controller X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2013 19:38:57 -0000 Author: hselasky Date: Tue Jan 8 19:38:57 2013 New Revision: 245175 URL: http://svnweb.freebsd.org/changeset/base/245175 Log: Shave off another register write to save some more microseconds of PCI access time. Tested by: sos @ Submitted by: sos @ 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 Tue Jan 8 19:16:28 2013 (r245174) +++ head/sys/dev/usb/controller/xhci.c Tue Jan 8 19:38:57 2013 (r245175) @@ -1440,24 +1440,33 @@ void xhci_interrupt(struct xhci_softc *sc) { uint32_t status; - uint32_t temp; + uint32_t iman; USB_BUS_LOCK(&sc->sc_bus); status = XREAD4(sc, oper, XHCI_USBSTS); + if (status == 0) + goto done; /* acknowledge interrupts */ XWRITE4(sc, oper, XHCI_USBSTS, status); - temp = XREAD4(sc, runt, XHCI_IMAN(0)); - - /* acknowledge pending event */ - - XWRITE4(sc, runt, XHCI_IMAN(0), temp); - - DPRINTFN(16, "real interrupt (sts=0x%08x, " - "iman=0x%08x)\n", status, temp); + 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); + } if (status & (XHCI_STS_PCD | XHCI_STS_HCH | XHCI_STS_HSE | XHCI_STS_HCE)) { @@ -1481,11 +1490,7 @@ xhci_interrupt(struct xhci_softc *sc) __FUNCTION__); } } - - /* check if we need to check the event rings */ - if ((status != 0) || (temp & XHCI_IMAN_INTR_PEND)) - xhci_interrupt_poll(sc); - +done: USB_BUS_UNLOCK(&sc->sc_bus); }