Module Name: src
Committed By: martin
Date: Mon Dec 15 11:53:58 UTC 2014
Modified Files:
src/sys/arch/arm/broadcom [netbsd-7]: bcm2835_emmc.c
Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #328):
sys/arch/arm/broadcom/bcm2835_emmc.c: revision 1.21
Don't pipeline any DMA writes to eMMC.
Fixes PR/49463.
To generate a diff of this commit:
cvs rdiff -u -r1.9.4.3 -r1.9.4.4 src/sys/arch/arm/broadcom/bcm2835_emmc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/broadcom/bcm2835_emmc.c
diff -u src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.9.4.3 src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.9.4.4
--- src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.9.4.3 Tue Nov 25 15:49:27 2014
+++ src/sys/arch/arm/broadcom/bcm2835_emmc.c Mon Dec 15 11:53:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_emmc.c,v 1.9.4.3 2014/11/25 15:49:27 martin Exp $ */
+/* $NetBSD: bcm2835_emmc.c,v 1.9.4.4 2014/12/15 11:53:58 martin Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_emmc.c,v 1.9.4.3 2014/11/25 15:49:27 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_emmc.c,v 1.9.4.4 2014/12/15 11:53:58 martin Exp $");
#include "bcmdmac.h"
@@ -278,6 +278,7 @@ bcmemmc_xfer_data_dma(struct sdhc_softc
if ((sc->sc_cblk[seg].cb_txfr_len & 0xf) == 0)
sc->sc_cblk[seg].cb_ti |= DMAC_TI_SRC_WIDTH;
sc->sc_cblk[seg].cb_ti |= DMAC_TI_DEST_DREQ;
+ sc->sc_cblk[seg].cb_ti |= DMAC_TI_WAIT_RESP;
sc->sc_cblk[seg].cb_source_ad =
cmd->c_dmamap->dm_segs[seg].ds_addr;
sc->sc_cblk[seg].cb_dest_ad =
@@ -286,7 +287,6 @@ bcmemmc_xfer_data_dma(struct sdhc_softc
}
sc->sc_cblk[seg].cb_stride = 0;
if (seg == cmd->c_dmamap->dm_nsegs - 1) {
- sc->sc_cblk[seg].cb_ti |= DMAC_TI_WAIT_RESP;
sc->sc_cblk[seg].cb_ti |= DMAC_TI_INTEN;
sc->sc_cblk[seg].cb_nextconbk = 0;
} else {
