From owner-svn-src-all@freebsd.org Sun Nov 3 21:17:51 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AC8101A3500; Sun, 3 Nov 2019 21:17:51 +0000 (UTC) (envelope-from wulf@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 475pg32rppz4hhq; Sun, 3 Nov 2019 21:17:51 +0000 (UTC) (envelope-from wulf@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 46BBA19D4D; Sun, 3 Nov 2019 21:17:51 +0000 (UTC) (envelope-from wulf@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xA3LHpxu078187; Sun, 3 Nov 2019 21:17:51 GMT (envelope-from wulf@FreeBSD.org) Received: (from wulf@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xA3LHpKK078186; Sun, 3 Nov 2019 21:17:51 GMT (envelope-from wulf@FreeBSD.org) Message-Id: <201911032117.xA3LHpKK078186@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wulf set sender to wulf@FreeBSD.org using -f From: Vladimir Kondratyev Date: Sun, 3 Nov 2019 21:17:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r354322 - head/sys/dev/ichiic X-SVN-Group: head X-SVN-Commit-Author: wulf X-SVN-Commit-Paths: head/sys/dev/ichiic X-SVN-Commit-Revision: 354322 X-SVN-Commit-Repository: base 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.29 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: Sun, 03 Nov 2019 21:17:51 -0000 Author: wulf Date: Sun Nov 3 21:17:50 2019 New Revision: 354322 URL: https://svnweb.freebsd.org/changeset/base/354322 Log: [ig4] Convert ithread interrupt handler to filter based one. Modified: head/sys/dev/ichiic/ig4_iic.c Modified: head/sys/dev/ichiic/ig4_iic.c ============================================================================== --- head/sys/dev/ichiic/ig4_iic.c Sun Nov 3 21:17:01 2019 (r354321) +++ head/sys/dev/ichiic/ig4_iic.c Sun Nov 3 21:17:50 2019 (r354322) @@ -122,7 +122,7 @@ static const struct ig4_hw ig4iic_hw[] = { }; static int ig4iic_set_config(ig4iic_softc_t *sc, bool reset); -static void ig4iic_intr(void *cookie); +static driver_filter_t ig4iic_intr; static void ig4iic_dump(ig4iic_softc_t *sc); static int ig4_dump; @@ -297,12 +297,12 @@ wait_intr(ig4iic_softc_t *sc, uint32_t intr) * When polling is not requested let the interrupt do its work. */ if (!DO_POLL(sc)) { - mtx_lock(&sc->io_lock); + mtx_lock_spin(&sc->io_lock); set_intr_mask(sc, intr | IG4_INTR_ERR_MASK); - mtx_sleep(sc, &sc->io_lock, 0, "i2cwait", + msleep_spin(sc, &sc->io_lock, "i2cwait", (hz + 99) / 100); /* sleep up to 10ms */ set_intr_mask(sc, 0); - mtx_unlock(&sc->io_lock); + mtx_unlock_spin(&sc->io_lock); count_us += 10000; } else { DELAY(25); @@ -1010,7 +1010,7 @@ ig4iic_attach(ig4iic_softc_t *sc) { int error; - mtx_init(&sc->io_lock, "IG4 I/O lock", NULL, MTX_DEF); + mtx_init(&sc->io_lock, "IG4 I/O lock", NULL, MTX_SPIN); sx_init(&sc->call_lock, "IG4 call lock"); ig4iic_get_config(sc); @@ -1037,7 +1037,7 @@ ig4iic_attach(ig4iic_softc_t *sc) goto done; } error = bus_setup_intr(sc->dev, sc->intr_res, INTR_TYPE_MISC | INTR_MPSAFE, - NULL, ig4iic_intr, sc, &sc->intr_handle); + ig4iic_intr, NULL, sc, &sc->intr_handle); if (error) { device_printf(sc->dev, "Unable to setup irq: error %d\n", error); @@ -1127,19 +1127,23 @@ int ig4iic_resume(ig4iic_softc_t *sc) /* * Interrupt Operation, see ig4_var.h for locking semantics. */ -static void +static int ig4iic_intr(void *cookie) { ig4iic_softc_t *sc = cookie; + int retval = FILTER_STRAY; - mtx_lock(&sc->io_lock); + mtx_lock_spin(&sc->io_lock); /* Ignore stray interrupts */ if (sc->intr_mask != 0 && reg_read(sc, IG4_REG_INTR_STAT) != 0) { /* Interrupt bits are cleared in wait_intr() loop */ set_intr_mask(sc, 0); wakeup(sc); + retval = FILTER_HANDLED; } - mtx_unlock(&sc->io_lock); + mtx_unlock_spin(&sc->io_lock); + + return (retval); } #define REGDUMP(sc, reg) \