Module Name: src
Committed By: jmcneill
Date: Tue Sep 12 13:43:37 UTC 2017
Modified Files:
src/sys/dev/sdmmc: sdmmc_mem.c sdmmcreg.h
Log Message:
For SD cards, send the SET_WR_BLK_ERASE_COUNT app command before a
multi-block write to improve write performance.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/sdmmc/sdmmc_mem.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/sdmmc/sdmmcreg.h
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/sdmmc_mem.c
diff -u src/sys/dev/sdmmc/sdmmc_mem.c:1.62 src/sys/dev/sdmmc/sdmmc_mem.c:1.63
--- src/sys/dev/sdmmc/sdmmc_mem.c:1.62 Sun Aug 20 15:58:43 2017
+++ src/sys/dev/sdmmc/sdmmc_mem.c Tue Sep 12 13:43:37 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sdmmc_mem.c,v 1.62 2017/08/20 15:58:43 mlelstv Exp $ */
+/* $NetBSD: sdmmc_mem.c,v 1.63 2017/09/12 13:43:37 jmcneill Exp $ */
/* $OpenBSD: sdmmc_mem.c,v 1.10 2009/01/09 10:55:22 jsg Exp $ */
/*
@@ -45,7 +45,7 @@
/* Routines for SD/MMC memory cards. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdmmc_mem.c,v 1.62 2017/08/20 15:58:43 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdmmc_mem.c,v 1.63 2017/09/12 13:43:37 jmcneill Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -2021,6 +2021,18 @@ sdmmc_mem_write_block_subr(struct sdmmc_
goto out;
}
+ const int nblk = howmany(datalen, SDMMC_SECTOR_SIZE);
+ if (ISSET(sc->sc_flags, SMF_SD_MODE) && nblk > 1) {
+ /* Set the number of write blocks to be pre-erased */
+ memset(&cmd, 0, sizeof(cmd));
+ cmd.c_opcode = SD_APP_SET_WR_BLK_ERASE_COUNT;
+ cmd.c_flags = SCF_RSP_R1 | SCF_RSP_SPI_R1 | SCF_CMD_AC;
+ cmd.c_arg = nblk;
+ error = sdmmc_app_command(sc, sf, &cmd);
+ if (error)
+ goto out;
+ }
+
memset(&cmd, 0, sizeof(cmd));
cmd.c_data = data;
cmd.c_datalen = datalen;
Index: src/sys/dev/sdmmc/sdmmcreg.h
diff -u src/sys/dev/sdmmc/sdmmcreg.h:1.32 src/sys/dev/sdmmc/sdmmcreg.h:1.33
--- src/sys/dev/sdmmc/sdmmcreg.h:1.32 Sun Jul 16 17:11:46 2017
+++ src/sys/dev/sdmmc/sdmmcreg.h Tue Sep 12 13:43:37 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sdmmcreg.h,v 1.32 2017/07/16 17:11:46 jmcneill Exp $ */
+/* $NetBSD: sdmmcreg.h,v 1.33 2017/09/12 13:43:37 jmcneill Exp $ */
/* $OpenBSD: sdmmcreg.h,v 1.4 2009/01/09 10:55:22 jsg Exp $ */
/*
@@ -67,6 +67,7 @@
/* SD application commands */ /* response type */
#define SD_APP_SET_BUS_WIDTH 6 /* R1 */
#define SD_APP_SD_STATUS 13 /* R1 */
+#define SD_APP_SET_WR_BLK_ERASE_COUNT 23 /* R1 */
#define SD_APP_OP_COND 41 /* R3 */
#define SD_APP_SEND_SCR 51 /* R1 */
