From owner-svn-src-all@FreeBSD.ORG  Wed Oct  8 08:51:06 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BB99C560;
 Wed,  8 Oct 2014 08:51:06 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A81B2DC6;
 Wed,  8 Oct 2014 08:51:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s988p6Ar054155;
 Wed, 8 Oct 2014 08:51:06 GMT (envelope-from br@FreeBSD.org)
Received: (from br@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s988p6w5054154;
 Wed, 8 Oct 2014 08:51:06 GMT (envelope-from br@FreeBSD.org)
Message-Id: <201410080851.s988p6w5054154@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: br set sender to br@FreeBSD.org
 using -f
From: Ruslan Bukin <br@FreeBSD.org>
Date: Wed, 8 Oct 2014 08:51:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r272736 - head/sys/dev/mmc/host
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Oct 2014 08:51:06 -0000

Author: br
Date: Wed Oct  8 08:51:05 2014
New Revision: 272736
URL: https://svnweb.freebsd.org/changeset/base/272736

Log:
  Always wait 'command done' interrupt status bit before proceeding next command.
  
  Sponsored by:	DARPA, AFRL

Modified:
  head/sys/dev/mmc/host/dwmmc.c

Modified: head/sys/dev/mmc/host/dwmmc.c
==============================================================================
--- head/sys/dev/mmc/host/dwmmc.c	Wed Oct  8 08:48:18 2014	(r272735)
+++ head/sys/dev/mmc/host/dwmmc.c	Wed Oct  8 08:51:05 2014	(r272736)
@@ -348,9 +348,10 @@ dwmmc_tasklet(struct dwmmc_softc *sc)
 	if (cmd == NULL)
 		return;
 
-	if (cmd->error != MMC_ERR_NONE) {
-		dwmmc_next_operation(sc);
-	} else if (!cmd->data && sc->cmd_done) {
+	if (!sc->cmd_done)
+		return;
+
+	if (cmd->error != MMC_ERR_NONE || !cmd->data) {
 		dwmmc_next_operation(sc);
 	} else if (cmd->data && sc->dto_rcvd) {
 		if ((cmd->opcode == MMC_WRITE_MULTIPLE_BLOCK ||
@@ -394,11 +395,8 @@ dwmmc_intr(void *arg)
 			dprintf("data err 0x%08x cmd 0x%08x\n",
 				reg, cmd->opcode);
 			cmd->error = MMC_ERR_FAILED;
-
 			dma_done(sc, cmd);
 			dma_stop(sc);
-			DWMMC_UNLOCK(sc);
-			return;
 		}
 
 		if (reg & SDMMC_INTMASK_CMD_DONE) {