From owner-p4-projects@FreeBSD.ORG  Tue Oct  3 20:09:41 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 ECD2F16A417; Tue,  3 Oct 2006 20:09:40 +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 C747F16A415
	for <perforce@freebsd.org>; Tue,  3 Oct 2006 20:09:40 +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 92EB143D45
	for <perforce@freebsd.org>; Tue,  3 Oct 2006 20:09:40 +0000 (GMT)
	(envelope-from imp@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 k93K9eFD094411
	for <perforce@freebsd.org>; Tue, 3 Oct 2006 20:09:40 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93K9eha094408
	for perforce@freebsd.org; Tue, 3 Oct 2006 20:09:40 GMT
	(envelope-from imp@freebsd.org)
Date: Tue, 3 Oct 2006 20:09:40 GMT
Message-Id: <200610032009.k93K9eha094408@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 107212 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, 03 Oct 2006 20:09:41 -0000

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

Change 107212 by imp@imp_lighthouse on 2006/10/03 20:09:31

	Turns out this is a bad idea

Affected files ...

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

Differences ...

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

@@ -501,12 +501,12 @@
 	sr = RD4(sc, MCI_SR) & RD4(sc, MCI_IMR);
 	printf("i 0x%x\n", sr);
 	cmd = sc->curcmd;
-	// Ignore CRC errors on CMD2 and ACMD47, per relevant standards
-	if (cmd->opcode == MMC_SEND_OP_COND ||
-	    cmd->opcode == ACMD_SD_SEND_OP_COND)
-		sr &= ~MCI_SR_RCRCE;
 	if (sr & MCI_SR_ERROR) {
-		if (sr & (MCI_SR_RTOE | MCI_SR_DTOE))
+		// 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))
+			cmd->error = MMC_ERR_NONE;
+		else if (sr & (MCI_SR_RTOE | MCI_SR_DTOE))
 			cmd->error = MMC_ERR_TIMEOUT;
 		else if (sr & (MCI_SR_RCRCE | MCI_SR_DCRCE))
 			cmd->error = MMC_ERR_BADCRC;