From owner-p4-projects@FreeBSD.ORG  Wed Mar  6 21:40:07 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 36F294EF; Wed,  6 Mar 2013 21:40:07 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id E8D4E4ED
 for <perforce@freebsd.org>; Wed,  6 Mar 2013 21:40:06 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id DA3D8A13
 for <perforce@freebsd.org>; Wed,  6 Mar 2013 21:40:06 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r26Le6HL064554
 for <perforce@freebsd.org>; Wed, 6 Mar 2013 21:40:06 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r26Le6fj064551
 for perforce@freebsd.org; Wed, 6 Mar 2013 21:40:06 GMT
 (envelope-from brooks@freebsd.org)
Date: Wed, 6 Mar 2013 21:40:06 GMT
Message-Id: <201303062140.r26Le6fj064551@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 222673 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Mar 2013 21:40:07 -0000

http://p4web.freebsd.org/@@222673?ac=10

Change 222673 by brooks@brooks_zenith on 2013/03/06 21:39:17

	Fix a truly embarrassing bug that resulted in only the first
	buffer of the block being written.  Performance is still quite
	good, but not as good as when I was only writing 1/128 of the
	data.
	
	Be more consistant about which address we write commands to.
	This doesn't appear to have been a functional issue with ISF
	parts, but consistancy is a good thing.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/dev/cfi/cfi_core.c#11 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/dev/cfi/cfi_core.c#11 (text+ko) ====

@@ -545,13 +545,13 @@
 					break;
 				}
 
-				cfi_write(sc, sc->sc_wrofs, CFI_BCS_CONFIRM);
+				cfi_write(sc, sc->sc_wrofs + i,
+				    CFI_BCS_CONFIRM);
 
-				error = cfi_wait_ready(sc, sc->sc_wrofs + 1,
+				error = cfi_wait_ready(sc, sc->sc_wrofs + i,
 				    &start, CFI_TIMEOUT_BUFWRITE);
-
-				goto out;
 			}
+			goto out;
 		default:
 			/* Fall through to single word case */
 			break;