From owner-p4-projects@FreeBSD.ORG  Wed Oct  4 00:18:28 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 7017716A492; Wed,  4 Oct 2006 00:18:28 +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 32F5A16A47C
	for <perforce@freebsd.org>; Wed,  4 Oct 2006 00:18:28 +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 F3A8743D4C
	for <perforce@freebsd.org>; Wed,  4 Oct 2006 00:18:27 +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 k940IRZq049267
	for <perforce@freebsd.org>; Wed, 4 Oct 2006 00:18:27 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k940IR4n049264
	for perforce@freebsd.org; Wed, 4 Oct 2006 00:18:27 GMT
	(envelope-from imp@freebsd.org)
Date: Wed, 4 Oct 2006 00:18:27 GMT
Message-Id: <200610040018.k940IR4n049264@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 107229 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, 04 Oct 2006 00:18:28 -0000

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

Change 107229 by imp@imp_lighthouse on 2006/10/04 00:17:41

	Fix broken locking.  simplify a open/close.

Affected files ...

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

Differences ...

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

@@ -89,7 +89,6 @@
 	sc->dev = dev;
 	MMCSD_LOCK_INIT(sc);
 
-	MMCSD_LOCK(sc);
 	sc->disk = disk_alloc();
 	sc->disk->d_open = mmcsd_open;
 	sc->disk->d_close = mmcsd_close;
@@ -103,7 +102,6 @@
 	sc->disk->d_unit = device_get_unit(dev);
 	disk_create(sc->disk, DISK_VERSION);
 	bioq_init(&sc->bio_queue);
-	MMCSD_UNLOCK(sc);
 	kthread_create(&mmcsd_task, sc, &sc->p, 0, 0, "task: mmc/sd card");
 
 	return (0);
@@ -118,27 +116,12 @@
 static int
 mmcsd_open(struct disk *dp)
 {
-	struct mmcsd_softc *sc;
-
-	sc = (struct mmcsd_softc *)dp->d_drv1;
-
-	MMCSD_LOCK(sc);
-	MMCSD_UNLOCK(sc);
-
 	return 0;
 }
 
 static int
 mmcsd_close(struct disk *dp)
 {
-	struct mmcsd_softc *sc;
-
-	sc = (struct mmcsd_softc *)dp->d_drv1;
-
-	MMCSD_LOCK(sc);
-	MMCSD_UNLOCK(sc);
-
-	// XXX do nothing since we don't lock for now
 	return 0;
 }
 
@@ -168,17 +151,17 @@
 	uint32_t block;
 	device_t dev;
 
-	MMCSD_LOCK(sc);
-	printf("mmcsd_task: start\n");
 	dev = sc->dev;
 	for (;;) {
+		MMCSD_LOCK(sc);
 		do {
 			bp = bioq_first(&sc->bio_queue);
 			if (bp == NULL)
 				msleep(sc, &sc->sc_mtx, PRIBIO, "jobqueue", 0);
 		} while (bp == NULL);
+		bioq_remove(&sc->bio_queue, bp);
+		MMCSD_UNLOCK(sc);
 		MMCBUS_ACQUIRE_BUS(device_get_parent(dev), dev);
-		bioq_remove(&sc->bio_queue, bp);
 //		printf("mmc_task: request %p for block %lld\n", bp, bp->bio_pblkno);
 		sz = sc->disk->d_sectorsize;
 		end = bp->bio_pblkno + (bp->bio_bcount / sz);