From owner-svn-src-stable-12@freebsd.org  Thu Nov 28 18:18:11 2019
Return-Path: <owner-svn-src-stable-12@freebsd.org>
Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 856081B1E0C;
 Thu, 28 Nov 2019 18:18:11 +0000 (UTC)
 (envelope-from manu@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 47P5VC30ZRz3Ny5;
 Thu, 28 Nov 2019 18:18:11 +0000 (UTC)
 (envelope-from manu@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4576C1AAC;
 Thu, 28 Nov 2019 18:18:11 +0000 (UTC)
 (envelope-from manu@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xASIIBGM086493;
 Thu, 28 Nov 2019 18:18:11 GMT (envelope-from manu@FreeBSD.org)
Received: (from manu@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id xASIIB69086492;
 Thu, 28 Nov 2019 18:18:11 GMT (envelope-from manu@FreeBSD.org)
Message-Id: <201911281818.xASIIB69086492@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: manu set sender to
 manu@FreeBSD.org using -f
From: Emmanuel Vadot <manu@FreeBSD.org>
Date: Thu, 28 Nov 2019 18:18:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r355181 - stable/12/sys/dev/mmc/host
X-SVN-Group: stable-12
X-SVN-Commit-Author: manu
X-SVN-Commit-Paths: stable/12/sys/dev/mmc/host
X-SVN-Commit-Revision: 355181
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-12@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for only the 12-stable src tree
 <svn-src-stable-12.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-12>, 
 <mailto:svn-src-stable-12-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-12/>
List-Post: <mailto:svn-src-stable-12@freebsd.org>
List-Help: <mailto:svn-src-stable-12-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-12>, 
 <mailto:svn-src-stable-12-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Nov 2019 18:18:11 -0000

Author: manu
Date: Thu Nov 28 18:18:10 2019
New Revision: 355181
URL: https://svnweb.freebsd.org/changeset/base/355181

Log:
  MFC r353354:
  
  dwmmc: Reset the dma controller at attach
  
  If the bootloader enabled DMA we need to fully reset the DMA controller
  otherwise we might have some stale data in it that provoke weird
  behavior.

Modified:
  stable/12/sys/dev/mmc/host/dwmmc.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/mmc/host/dwmmc.c
==============================================================================
--- stable/12/sys/dev/mmc/host/dwmmc.c	Thu Nov 28 18:15:05 2019	(r355180)
+++ stable/12/sys/dev/mmc/host/dwmmc.c	Thu Nov 28 18:18:10 2019	(r355181)
@@ -559,6 +559,7 @@ dwmmc_attach(device_t dev)
 	}
 
 	if (!sc->use_pio) {
+		dma_stop(sc);
 		if (dma_setup(sc))
 			return (ENXIO);