diff options
| author | jakllsch <jakllsch@NetBSD.org> | 2012-07-12 16:32:34 +0000 |
|---|---|---|
| committer | jakllsch <jakllsch@NetBSD.org> | 2012-07-12 16:32:34 +0000 |
| commit | 18ec52ce97a63761ad26b998c8f321cda7fc7f36 (patch) | |
| tree | 24f445bbfc2607014c98c9a5584b6ad63da2530a /sys/dev | |
| parent | 09665e2558352238f6d7255d76dcd2a1705b884d (diff) | |
Always enable and set block count register. We never do infinite transfers.
The old way seemed to be causing issues on a R5C822, at least with DMA enabled.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/sdmmc/sdhc.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/sys/dev/sdmmc/sdhc.c b/sys/dev/sdmmc/sdhc.c index 148186339ad..fcfcdf8c003 100644 --- a/sys/dev/sdmmc/sdhc.c +++ b/sys/dev/sdmmc/sdhc.c @@ -1,4 +1,4 @@ -/* $NetBSD: sdhc.c,v 1.14 2012/07/12 03:05:49 matt Exp $ */ +/* $NetBSD: sdhc.c,v 1.15 2012/07/12 16:32:34 jakllsch 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.14 2012/07/12 03:05:49 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.15 2012/07/12 16:32:34 jakllsch Exp $"); #ifdef _KERNEL_OPT #include "opt_sdmmc.h" @@ -1083,16 +1083,13 @@ sdhc_start_command(struct sdhc_host *hp, struct sdmmc_command *cmd) } /* Prepare transfer mode register value. (2.2.5) */ - mode = 0; + mode = SDHC_BLOCK_COUNT_ENABLE; if (ISSET(cmd->c_flags, SCF_CMD_READ)) mode |= SDHC_READ_MODE; - if (blkcount > 0) { - mode |= SDHC_BLOCK_COUNT_ENABLE; - if (blkcount > 1) { - mode |= SDHC_MULTI_BLOCK_MODE; - /* XXX only for memory commands? */ - mode |= SDHC_AUTO_CMD12_ENABLE; - } + if (blkcount > 1) { + mode |= SDHC_MULTI_BLOCK_MODE; + /* XXX only for memory commands? */ + mode |= SDHC_AUTO_CMD12_ENABLE; } if (cmd->c_dmamap != NULL && cmd->c_datalen > 0) { if (cmd->c_dmamap->dm_nsegs == 1) { @@ -1151,11 +1148,10 @@ sdhc_start_command(struct sdhc_host *hp, struct sdmmc_command *cmd) HWRITE4(hp, SDHC_ARGUMENT, cmd->c_arg); HWRITE4(hp, SDHC_TRANSFER_MODE, mode | (command << 16)); } else { - HWRITE2(hp, SDHC_TRANSFER_MODE, mode); HWRITE2(hp, SDHC_BLOCK_SIZE, blksize); - if (blkcount > 1) - HWRITE2(hp, SDHC_BLOCK_COUNT, blkcount); + HWRITE2(hp, SDHC_BLOCK_COUNT, blkcount); HWRITE4(hp, SDHC_ARGUMENT, cmd->c_arg); + HWRITE2(hp, SDHC_TRANSFER_MODE, mode); HWRITE2(hp, SDHC_COMMAND, command); } |
