Module Name: src Committed By: nonaka Date: Fri Feb 27 15:53:09 UTC 2015
Modified Files: src/sys/dev/sdmmc: sdhc.c Log Message: eSDHC has no DMA_BOUNDARY in BLOCK_SIZE register. So clear multi segment DMA transfer support bit. To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/sys/dev/sdmmc/sdhc.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/dev/sdmmc/sdhc.c diff -u src/sys/dev/sdmmc/sdhc.c:1.53 src/sys/dev/sdmmc/sdhc.c:1.54 --- src/sys/dev/sdmmc/sdhc.c:1.53 Fri Feb 27 01:52:15 2015 +++ src/sys/dev/sdmmc/sdhc.c Fri Feb 27 15:53:09 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: sdhc.c,v 1.53 2015/02/27 01:52:15 nonaka Exp $ */ +/* $NetBSD: sdhc.c,v 1.54 2015/02/27 15:53:09 nonaka Exp $ */ /* $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $ */ /* @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.53 2015/02/27 01:52:15 nonaka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.54 2015/02/27 15:53:09 nonaka Exp $"); #ifdef _KERNEL_OPT #include "opt_sdmmc.h" @@ -425,7 +425,9 @@ sdhc_host_found(struct sdhc_softc *sc, b if (ISSET(caps, SDHC_HIGH_SPEED_SUPP)) saa.saa_caps |= SMC_CAPS_SD_HIGHSPEED; if (ISSET(hp->flags, SHF_USE_DMA)) { - saa.saa_caps |= SMC_CAPS_DMA | SMC_CAPS_MULTI_SEG_DMA; + saa.saa_caps |= SMC_CAPS_DMA; + if (!ISSET(hp->sc->sc_flags, SDHC_FLAG_ENHANCED)) + saa.saa_caps |= SMC_CAPS_MULTI_SEG_DMA; } if (ISSET(sc->sc_flags, SDHC_FLAG_SINGLE_ONLY)) saa.saa_caps |= SMC_CAPS_SINGLE_ONLY;