Module Name: src Committed By: mlelstv Date: Mon Dec 15 08:17:15 UTC 2014
Modified Files: src/sys/arch/arm/broadcom: bcm2835_emmc.c Log Message: Don't pipeline any DMA writes to eMMC. Fixes PR/49463. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 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.20 src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.21 --- src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.20 Tue Nov 25 14:30:05 2014 +++ src/sys/arch/arm/broadcom/bcm2835_emmc.c Mon Dec 15 08:17:15 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: bcm2835_emmc.c,v 1.20 2014/11/25 14:30:05 skrll Exp $ */ +/* $NetBSD: bcm2835_emmc.c,v 1.21 2014/12/15 08:17:15 mlelstv 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.20 2014/11/25 14:30:05 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bcm2835_emmc.c,v 1.21 2014/12/15 08:17:15 mlelstv 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 {