From owner-svn-src-head@FreeBSD.ORG  Tue Mar 10 22:29:42 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A442B106566B;
	Tue, 10 Mar 2009 22:29:42 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 926EE8FC1B;
	Tue, 10 Mar 2009 22:29:42 +0000 (UTC) (envelope-from sam@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 n2AMTggW075574;
	Tue, 10 Mar 2009 22:29:42 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2AMTgvM075573;
	Tue, 10 Mar 2009 22:29:42 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200903102229.n2AMTgvM075573@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Tue, 10 Mar 2009 22:29:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r189654 - head/sys/dev/cfi
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Mar 2009 22:29:43 -0000

Author: sam
Date: Tue Mar 10 22:29:42 2009
New Revision: 189654
URL: http://svn.freebsd.org/changeset/base/189654

Log:
  choose the size of the last region for d_stripsize instead of the first;
  this fixes geom_redboot on boards that have multiple parts/regions as it
  uses the value to locate the FIS directory which is in the last erase
  region of flash

Modified:
  head/sys/dev/cfi/cfi_disk.c

Modified: head/sys/dev/cfi/cfi_disk.c
==============================================================================
--- head/sys/dev/cfi/cfi_disk.c	Tue Mar 10 22:04:52 2009	(r189653)
+++ head/sys/dev/cfi/cfi_disk.c	Tue Mar 10 22:29:42 2009	(r189654)
@@ -99,9 +99,16 @@ cfi_disk_attach(device_t dev)
 	sc->disk->d_mediasize = sc->parent->sc_size;
 	sc->disk->d_maxsize = CFI_DISK_MAXIOSIZE;
 	/* NB: use stripesize to hold the erase/region size */
-	if (sc->parent->sc_regions)
-		sc->disk->d_stripesize = sc->parent->sc_region->r_blksz;
-	else
+	if (sc->parent->sc_regions) {
+		/*
+		 * Multiple regions, use the last one.  This is a
+		 * total hack as it's (presently) used only by
+		 * geom_redboot to locate the FIS directory which
+		 * lies at the start of the last erase region.
+		 */
+		sc->disk->d_stripesize =
+		    sc->parent->sc_region[sc->parent->sc_regions-1].r_blksz;
+	} else
 		sc->disk->d_stripesize = sc->disk->d_mediasize;
 	sc->disk->d_drv1 = sc;
 	disk_create(sc->disk, DISK_VERSION);