Module Name: src
Committed By: jakllsch
Date: Thu Jul 12 16:32:34 UTC 2012
Modified Files:
src/sys/dev/sdmmc: sdhc.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 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.14 src/sys/dev/sdmmc/sdhc.c:1.15
--- src/sys/dev/sdmmc/sdhc.c:1.14 Thu Jul 12 03:05:49 2012
+++ src/sys/dev/sdmmc/sdhc.c Thu Jul 12 16:32:34 2012
@@ -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,
}
/* 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,
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);
}
