From owner-p4-projects@FreeBSD.ORG  Tue Oct  3 00:12:46 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 CFC4016A4A0; Tue,  3 Oct 2006 00:12:45 +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 7D74216A403
	for <perforce@freebsd.org>; Tue,  3 Oct 2006 00:12:45 +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 4B28143D49
	for <perforce@freebsd.org>; Tue,  3 Oct 2006 00:12:45 +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 k930Cjwe030643
	for <perforce@freebsd.org>; Tue, 3 Oct 2006 00:12:45 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k930Cjiq030640
	for perforce@freebsd.org; Tue, 3 Oct 2006 00:12:45 GMT
	(envelope-from imp@freebsd.org)
Date: Tue, 3 Oct 2006 00:12:45 GMT
Message-Id: <200610030012.k930Cjiq030640@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 107131 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 00:12:46 -0000

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

Change 107131 by imp@imp_lighthouse on 2006/10/03 00:12:29

	Implement mmc acquire and release bus.

Affected files ...

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

Differences ...

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

@@ -45,6 +45,7 @@
 	device_t dev;
 	struct mtx sc_mtx;
 	struct intr_config_hook config_intrhook;
+	device_t owner;
 };
 
 /*
@@ -115,14 +116,44 @@
 	return (EBUSY);	/* XXX */
 }
 
-static void
-mmc_acquire_bus(struct mmc_softc *sc)
+static int
+mmc_acquire_bus(device_t busdev, device_t dev)
 {
+	struct mmc_softc *sc;
+	int err;
+
+	err = MMCBR_ACQUIRE_HOST(device_get_parent(busdev), dev);
+	if (err)
+		return (err);
+	sc = device_get_softc(busdev);
+	MMC_LOCK(sc);
+	if (sc->owner)
+		panic("How did I get here?");
+	sc->owner = dev;
+	MMC_UNLOCK(sc);
+	return (0);
 }
 
-static void
-mmc_release_bus(struct mmc_softc *sc)
+static int
+mmc_release_bus(device_t busdev, device_t dev)
 {
+	struct mmc_softc *sc;
+	int err;
+
+	sc = device_get_softc(busdev);
+	MMC_LOCK(sc);
+	if (!sc->owner)
+		panic("No owner?");
+	if (sc->owner != dev)
+		panic("Wrong owner releasing?");
+	MMC_UNLOCK(sc);
+	err = MMCBR_RELEASE_HOST(device_get_parent(busdev), dev);
+	if (err)
+		return (err);
+	MMC_LOCK(sc);
+	sc->owner = NULL;
+	MMC_UNLOCK(sc);
+	return (0);
 }
 
 static int
@@ -565,7 +596,7 @@
 	device_t dev;
 
 	dev = sc->dev;
-	mmc_acquire_bus(sc);
+	mmc_acquire_bus(dev, dev);
 
 	if (mmcbr_get_power_mode(dev) == power_on)
 		mmc_rescan_cards(sc);
@@ -573,7 +604,7 @@
 	mmcbr_set_clock(dev, mmc_calculate_clock(sc));
 	mmcbr_update_ios(dev);
 
-	mmc_release_bus(sc);
+	mmc_release_bus(dev, dev);
 	// XXX probe/attach/detach children?
 }
 
@@ -635,6 +666,8 @@
 
 	/* MMC Bus interface */
 	DEVMETHOD(mmcbus_wait_for_request, mmc_wait_for_request),
+	DEVMETHOD(mmcbus_acquire_bus, mmc_acquire_bus),
+	DEVMETHOD(mmcbus_release_bus, mmc_release_bus),
 
 	{0, 0},
 };