From owner-p4-projects@FreeBSD.ORG  Wed Dec 27 01:20:17 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 DC91716A415; Wed, 27 Dec 2006 01:20:16 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 9B35816A40F
	for <perforce@freebsd.org>; Wed, 27 Dec 2006 01:20:16 +0000 (UTC)
	(envelope-from ticso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 7872813C474
	for <perforce@freebsd.org>; Wed, 27 Dec 2006 01:20:16 +0000 (UTC)
	(envelope-from ticso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBR1KGMr060136
	for <perforce@freebsd.org>; Wed, 27 Dec 2006 01:20:16 GMT
	(envelope-from ticso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBR1KGeo060133
	for perforce@freebsd.org; Wed, 27 Dec 2006 01:20:16 GMT
	(envelope-from ticso@freebsd.org)
Date: Wed, 27 Dec 2006 01:20:16 GMT
Message-Id: <200612270120.kBR1KGeo060133@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	ticso@freebsd.org using -f
From: Bernd Walter <ticso@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 112151 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: Wed, 27 Dec 2006 01:20:17 -0000

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

Change 112151 by ticso@ticso on 2006/12/27 01:19:56

	read access require PDC to be setup first otherwise one might
	get overrun errors.
	write access however need cmd first, so keep the existing order
	for them.

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/at91_mci.c#28 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/at91/at91_mci.c#28 (text+ko) ====

@@ -403,12 +403,14 @@
 	}
 //	printf("CMDR %x ARGR %x with data\n", cmdr, cmd->arg);
 	WR4(sc, MCI_ARGR, cmd->arg);
-	WR4(sc, MCI_CMDR, cmdr);
 	if (cmdr & MCI_CMDR_TRCMD_START) {
-		if (cmdr & MCI_CMDR_TRDIR)
+		if (cmdr & MCI_CMDR_TRDIR) {
 			WR4(sc, PDC_PTCR, PDC_PTCR_RXTEN);
-		else
+			WR4(sc, MCI_CMDR, cmdr);
+		} else {
+			WR4(sc, MCI_CMDR, cmdr);
 			WR4(sc, PDC_PTCR, PDC_PTCR_TXTEN);
+		}
 	}
 	WR4(sc, MCI_IER, MCI_SR_ERROR | ier);
 }
@@ -538,6 +540,7 @@
 //	printf("i 0x%x\n", sr);
 	cmd = sc->curcmd;
 	if (sr & MCI_SR_ERROR) {
+//		printf("MCI_SR_ERROR 0x%x\n", sr & MCI_SR_ERROR);
 		// Ignore CRC errors on CMD2 and ACMD47, per relevant standards
 		if ((sr & MCI_SR_RCRCE) && (cmd->opcode == MMC_SEND_OP_COND ||
 		    cmd->opcode == ACMD_SD_SEND_OP_COND))