From owner-svn-src-stable@FreeBSD.ORG Mon Sep 23 21:52:07 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D7CCFE9C; Mon, 23 Sep 2013 21:52:07 +0000 (UTC) (envelope-from ken@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C56EF2CB1; Mon, 23 Sep 2013 21:52:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8NLq7qZ094153; Mon, 23 Sep 2013 21:52:07 GMT (envelope-from ken@svn.freebsd.org) Received: (from ken@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8NLq7do094150; Mon, 23 Sep 2013 21:52:07 GMT (envelope-from ken@svn.freebsd.org) Message-Id: <201309232152.r8NLq7do094150@svn.freebsd.org> From: "Kenneth D. Merry" Date: Mon, 23 Sep 2013 21:52:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r255830 - stable/9/sys/dev/mps X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Sep 2013 21:52:07 -0000 Author: ken Date: Mon Sep 23 21:52:07 2013 New Revision: 255830 URL: http://svnweb.freebsd.org/changeset/base/255830 Log: MFC r255501 This is slightly modified from the FreeBSD/head version, to include version checks for the scanning changes for not only FreeBSD/head (1000039 and higher) but also stable/9 (902502 and higher). ------------------------------------------------------------------------ r255501 | ken | 2013-09-12 16:06:12 -0600 (Thu, 12 Sep 2013) | 18 lines Fix an issue that caused Integrated RAID volumes on LSI mps(4) controllers to not get scanned on boot. The problem originated in change 253549. With the change to the mps(4) driver to scan only targets that it knows it has (as opposed to scanning the entire bus), scanning RAID volumes on boot was omitted. So, for versions of FreeBSD that have the scanning changes (__FreeBSD_version 1000039 and higher), scan RAID volumes that are added whether or not we're booting. PR: kern/181784 Reported by: Xiguang Wang Tested by: Dennis Glatting Sponsored by: Spectra Logic PR: kern/181784 Modified: stable/9/sys/dev/mps/mps_sas_lsi.c Modified: stable/9/sys/dev/mps/mps_sas_lsi.c ============================================================================== --- stable/9/sys/dev/mps/mps_sas_lsi.c Mon Sep 23 20:35:54 2013 (r255829) +++ stable/9/sys/dev/mps/mps_sas_lsi.c Mon Sep 23 21:52:07 2013 (r255830) @@ -892,7 +892,10 @@ mpssas_volume_add(struct mps_softc *sc, free(lun, M_MPT2); } SLIST_INIT(&targ->luns); +#if ((__FreeBSD_version >= 1000000) && (__FreeBSD_version < 1000039)) || \ + (__FreeBSD_version < 902502) if ((sassc->flags & MPSSAS_IN_STARTUP) == 0) +#endif mpssas_rescan_target(sc, targ); mps_dprint(sc, MPS_MAPPING, "RAID target id %d added (WWID = 0x%jx)\n", targ->tid, wwid);