From owner-svn-src-all@FreeBSD.ORG Tue Apr 14 20:10:54 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 03A3B106579B; Tue, 14 Apr 2009 20:10:54 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E4BFE8FC27; Tue, 14 Apr 2009 20:10:53 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3EKArjI018541; Tue, 14 Apr 2009 20:10:53 GMT (envelope-from scottl@svn.freebsd.org) Received: (from scottl@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3EKAr9R018540; Tue, 14 Apr 2009 20:10:53 GMT (envelope-from scottl@svn.freebsd.org) Message-Id: <200904142010.n3EKAr9R018540@svn.freebsd.org> From: Scott Long Date: Tue, 14 Apr 2009 20:10:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191075 - stable/7/sys/dev/amr X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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, 14 Apr 2009 20:10:56 -0000 Author: scottl Date: Tue Apr 14 20:10:53 2009 New Revision: 191075 URL: http://svn.freebsd.org/changeset/base/191075 Log: Don't register the CAM passthrough interface until interrupts are running. This fixes some problems at boot for some that are happening in fairly rare cases. It's just a hack, though, which is why it's only going into stable/7 for now. Note that this hack has a side effect of possibly not scanning the AMR buses for /dev/passN devices at boot. These devices are not required for access to the RAID arrays, and only a few tools use them. If this affects you, let me know. Approved by: re Modified: stable/7/sys/dev/amr/amr.c Modified: stable/7/sys/dev/amr/amr.c ============================================================================== --- stable/7/sys/dev/amr/amr.c Tue Apr 14 19:51:14 2009 (r191074) +++ stable/7/sys/dev/amr/amr.c Tue Apr 14 20:10:53 2009 (r191075) @@ -259,15 +259,6 @@ amr_attach(struct amr_softc *sc) */ amr_init_sysctl(sc); -#if AMR_ENABLE_CAM != 0 - /* - * Attach our 'real' SCSI channels to CAM. - */ - if (amr_cam_attach(sc)) - return(ENXIO); - debug(2, "CAM attach done"); -#endif - /* * Create the control device. */ @@ -357,6 +348,15 @@ amr_startup(void *arg) */ /* sc->amr_timeout = timeout(amr_periodic, sc, hz);*/ +#if AMR_ENABLE_CAM != 0 + /* + * Attach our 'real' SCSI channels to CAM. + */ + if (amr_cam_attach(sc)) + device_printf(sc->amr_dev, "CAM passthrough attachment failed\n"); + debug(2, "CAM attach done"); +#endif + return; }