From owner-p4-projects@FreeBSD.ORG  Tue Apr 25 17:31:49 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7566016A404; Tue, 25 Apr 2006 17:31:49 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3BB6E16A410
	for <perforce@freebsd.org>; Tue, 25 Apr 2006 17:31:49 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E433043D73
	for <perforce@freebsd.org>; Tue, 25 Apr 2006 17:31:44 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3PHViAM049815
	for <perforce@freebsd.org>; Tue, 25 Apr 2006 17:31:44 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3PHViBv049807
	for perforce@freebsd.org; Tue, 25 Apr 2006 17:31:44 GMT
	(envelope-from imp@freebsd.org)
Date: Tue, 25 Apr 2006 17:31:44 GMT
Message-Id: <200604251731.k3PHViBv049807@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 96073 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Tue, 25 Apr 2006 17:31:49 -0000

http://perforce.freebsd.org/chv.cgi?CH=96073

Change 96073 by imp@imp_hammer on 2006/04/25 17:31:12

	OK.  It appears we have to wait for at least 23 SLCK ticks before
	we can try to get the status again.  This corresponds to ~70us.  I
	don't see anything on the datasheet that would suggest why this is
	necessary, but weird shit happens when I don't do this :-(.  22
	or 21 also seem to work mostly , but 20 seems to never work.  We
	may need to bump this value up with experience.

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.c#7 edit

Differences ...

==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.c#7 (text+ko) ====

@@ -35,15 +35,11 @@
 static void
 Delay(void)
 {
-#if 0
 	unsigned later;
 
-	later = (AT91C_BASE_ST->ST_CRTR + 10) & AT91C_ST_CRTV;
+	later = (AT91C_BASE_ST->ST_CRTR + 23) & AT91C_ST_CRTV;
 	while (later != AT91C_BASE_ST->ST_CRTR)
 		continue;
-#else
-	printf("V--------");
-#endif
 }
 
 /*
@@ -306,8 +302,9 @@
 	value = pSPI->SPI_RDR;
 	value = pSPI->SPI_SR;
 
+	// Increment real time counter every SLCK
+	AT91C_BASE_ST->ST_RTMR = 1;
+
 	if (((initStatus = GetFlashStatus()) & 0xFC) != 0xBC)
 		printf(" Unexpected SPI flash status: 0x%x\r\n", initStatus);
-	// Increment real time counter every SLCK
-	AT91C_BASE_ST->ST_RTMR = 1;
 }