From owner-svn-src-all@freebsd.org Sun Sep 10 07:10:41 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7ABE2E016BB; Sun, 10 Sep 2017 07:10:41 +0000 (UTC) (envelope-from scottl@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 mx1.freebsd.org (Postfix) with ESMTPS id 5773F68580; Sun, 10 Sep 2017 07:10:41 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8A7AeXr064338; Sun, 10 Sep 2017 07:10:40 GMT (envelope-from scottl@FreeBSD.org) Received: (from scottl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8A7Ae8e064334; Sun, 10 Sep 2017 07:10:40 GMT (envelope-from scottl@FreeBSD.org) Message-Id: <201709100710.v8A7Ae8e064334@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: scottl set sender to scottl@FreeBSD.org using -f From: Scott Long Date: Sun, 10 Sep 2017 07:10:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r323384 - in head/sys/dev: mpr mps X-SVN-Group: head X-SVN-Commit-Author: scottl X-SVN-Commit-Paths: in head/sys/dev: mpr mps X-SVN-Commit-Revision: 323384 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.23 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, 10 Sep 2017 07:10:41 -0000 Author: scottl Date: Sun Sep 10 07:10:40 2017 New Revision: 323384 URL: https://svnweb.freebsd.org/changeset/base/323384 Log: Fix intrhook release in MPR and MPS for EARLY_AP_STARTUP. Reported by: Limelight Sponsored by: Netflix Modified: head/sys/dev/mpr/mpr.c head/sys/dev/mpr/mpr_sas.c head/sys/dev/mps/mps.c head/sys/dev/mps/mps_sas.c Modified: head/sys/dev/mpr/mpr.c ============================================================================== --- head/sys/dev/mpr/mpr.c Sun Sep 10 04:09:18 2017 (r323383) +++ head/sys/dev/mpr/mpr.c Sun Sep 10 07:10:40 2017 (r323384) @@ -1816,6 +1816,11 @@ mpr_startup(void *arg) mpr_mapping_initialize(sc); mprsas_startup(sc); mpr_unlock(sc); + + mpr_dprint(sc, MPR_INIT, "disestablish config intrhook\n"); + config_intrhook_disestablish(&sc->mpr_ich); + sc->mpr_ich.ich_arg = NULL; + mpr_dprint(sc, MPR_INIT, "%s exit\n", __func__); } Modified: head/sys/dev/mpr/mpr_sas.c ============================================================================== --- head/sys/dev/mpr/mpr_sas.c Sun Sep 10 04:09:18 2017 (r323383) +++ head/sys/dev/mpr/mpr_sas.c Sun Sep 10 07:10:40 2017 (r323384) @@ -3829,12 +3829,6 @@ mprsas_portenable_complete(struct mpr_softc *sc, struc mpr_dprint(sc, MPR_FAULT, "Portenable failed\n"); mpr_free_command(sc, cm); - if (sc->mpr_ich.ich_arg != NULL) { - mpr_dprint(sc, MPR_XINFO, "disestablish config intrhook\n"); - config_intrhook_disestablish(&sc->mpr_ich); - sc->mpr_ich.ich_arg = NULL; - } - /* * Done waiting for port enable to complete. Decrement the refcount. * If refcount is 0, discovery is complete and a rescan of the bus can Modified: head/sys/dev/mps/mps.c ============================================================================== --- head/sys/dev/mps/mps.c Sun Sep 10 04:09:18 2017 (r323383) +++ head/sys/dev/mps/mps.c Sun Sep 10 07:10:40 2017 (r323384) @@ -1673,6 +1673,11 @@ mps_startup(void *arg) mps_mapping_initialize(sc); mpssas_startup(sc); mps_unlock(sc); + + mps_dprint(sc, MPS_INIT, "disestablish config intrhook\n"); + config_intrhook_disestablish(&sc->mps_ich); + sc->mps_ich.ich_arg = NULL; + mps_dprint(sc, MPS_INIT, "%s exit\n", __func__); } Modified: head/sys/dev/mps/mps_sas.c ============================================================================== --- head/sys/dev/mps/mps_sas.c Sun Sep 10 04:09:18 2017 (r323383) +++ head/sys/dev/mps/mps_sas.c Sun Sep 10 07:10:40 2017 (r323384) @@ -3557,11 +3557,6 @@ mpssas_portenable_complete(struct mps_softc *sc, struc mps_dprint(sc, MPS_FAULT, "Portenable failed\n"); mps_free_command(sc, cm); - if (sc->mps_ich.ich_arg != NULL) { - mps_dprint(sc, MPS_XINFO, "disestablish config intrhook\n"); - config_intrhook_disestablish(&sc->mps_ich); - sc->mps_ich.ich_arg = NULL; - } /* * Get WarpDrive info after discovery is complete but before the scan