From owner-svn-src-head@freebsd.org  Fri Sep  8 17:40:31 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 21E73E007CB;
 Fri,  8 Sep 2017 17:40:31 +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 E544063A40;
 Fri,  8 Sep 2017 17:40:30 +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 v88HeUfC045684;
 Fri, 8 Sep 2017 17:40:30 GMT (envelope-from scottl@FreeBSD.org)
Received: (from scottl@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v88HeUOJ045683;
 Fri, 8 Sep 2017 17:40:30 GMT (envelope-from scottl@FreeBSD.org)
Message-Id: <201709081740.v88HeUOJ045683@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: scottl set sender to
 scottl@FreeBSD.org using -f
From: Scott Long <scottl@FreeBSD.org>
Date: Fri, 8 Sep 2017 17:40:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r323319 - head/sys/dev/amr
X-SVN-Group: head
X-SVN-Commit-Author: scottl
X-SVN-Commit-Paths: head/sys/dev/amr
X-SVN-Commit-Revision: 323319
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Sep 2017 17:40:31 -0000

Author: scottl
Date: Fri Sep  8 17:40:29 2017
New Revision: 323319
URL: https://svnweb.freebsd.org/changeset/base/323319

Log:
  As with r323317, hold off on releasing the intrhook during boot until
  we're ready to accept probing from GEOM.  Untested, but the pattern is
  the same as with aac.

Modified:
  head/sys/dev/amr/amr.c

Modified: head/sys/dev/amr/amr.c
==============================================================================
--- head/sys/dev/amr/amr.c	Fri Sep  8 16:59:56 2017	(r323318)
+++ head/sys/dev/amr/amr.c	Fri Sep  8 17:40:29 2017	(r323319)
@@ -302,11 +302,6 @@ amr_startup(void *arg)
     
     debug_called(1);
 
-    /* pull ourselves off the intrhook chain */
-    if (sc->amr_ich.ich_func)
-	config_intrhook_disestablish(&sc->amr_ich);
-    sc->amr_ich.ich_func = NULL;
-
     /* get up-to-date drive information */
     if (amr_query_controller(sc)) {
 	device_printf(sc->amr_dev, "can't scan controller for drives\n");
@@ -342,6 +337,11 @@ amr_startup(void *arg)
 
     /* interrupts will be enabled before we do anything more */
     sc->amr_state |= AMR_STATE_INTEN;
+
+    /* pull ourselves off the intrhook chain */
+    if (sc->amr_ich.ich_func)
+	config_intrhook_disestablish(&sc->amr_ich);
+    sc->amr_ich.ich_func = NULL;
 
     return;
 }