From owner-p4-projects@FreeBSD.ORG  Tue Oct  3 20:39:32 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 E617E16A4C9; Tue,  3 Oct 2006 20:39:31 +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 AC41716A49E
	for <perforce@freebsd.org>; Tue,  3 Oct 2006 20:39:31 +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 00D5D43DDB
	for <perforce@freebsd.org>; Tue,  3 Oct 2006 20:39:17 +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 k93KdHaP099388
	for <perforce@freebsd.org>; Tue, 3 Oct 2006 20:39:17 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93KdHt6099385
	for perforce@freebsd.org; Tue, 3 Oct 2006 20:39:17 GMT
	(envelope-from imp@freebsd.org)
Date: Tue, 3 Oct 2006 20:39:17 GMT
Message-Id: <200610032039.k93KdHt6099385@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 107213 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:39:32 -0000

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

Change 107213 by imp@imp_lighthouse on 2006/10/03 20:38:55

	Only select a card when it is the card acquiring the bus.  Ditto
	deselect.

Affected files ...

.. //depot/projects/arm/src/sys/dev/mmc/mmc.c#19 edit

Differences ...

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

@@ -133,15 +133,15 @@
 		panic("mmc: host bridge didn't seralize us.");
 	sc->owner = dev;
 	MMC_UNLOCK(sc);
-	// XXX Should do lazy selection.
 
-	printf("Selecting card %#x\n", mmc_get_rca(dev));
-	cmd.opcode = MMC_SELECT_CARD;
-	cmd.arg = mmc_get_rca(dev) << 16;
-	cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
-	mmc_wait_for_cmd(sc, &cmd, CMD_RETRIES);
-
-	// XXX should set bus width here?
+	if (busdev != dev) {
+		// XXX Should do lazy selection.
+		cmd.opcode = MMC_SELECT_CARD;
+		cmd.arg = mmc_get_rca(dev) << 16;
+		cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
+		mmc_wait_for_cmd(sc, &cmd, CMD_RETRIES);
+		// XXX should set bus width here?
+	}
 	return (0);
 }
 
@@ -153,13 +153,14 @@
 	int err;
 
 	sc = device_get_softc(busdev);
-	// XXX Should do lazy selection.
 
-	cmd.opcode = MMC_DESELECT_CARD;
-	cmd.arg = 0;
-	cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
-	mmc_wait_for_cmd(sc, &cmd, CMD_RETRIES);
-
+	if (busdev != dev) {
+		// XXX Should do lazy selection.
+		cmd.opcode = MMC_DESELECT_CARD;
+		cmd.arg = 0;
+		cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
+		mmc_wait_for_cmd(sc, &cmd, CMD_RETRIES);
+	}
 	MMC_LOCK(sc);
 	if (!sc->owner)
 		panic("mmc: releasing unowned bus.");