diff options
| author | jmcneill <jmcneill@NetBSD.org> | 2017-09-12 13:43:37 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill@NetBSD.org> | 2017-09-12 13:43:37 +0000 |
| commit | bfbacaabe89b5d4589f18ad62aae53e2f8762d98 (patch) | |
| tree | 9d6bea7f2485526134a44d756ab787cf05ba2c8d /sys/dev/sdmmc | |
| parent | d9d55b91da7647e43b6f4cbdfe8db2c1708f09a5 (diff) | |
For SD cards, send the SET_WR_BLK_ERASE_COUNT app command before a
multi-block write to improve write performance.
Diffstat (limited to 'sys/dev/sdmmc')
| -rw-r--r-- | sys/dev/sdmmc/sdmmc_mem.c | 16 | ||||
| -rw-r--r-- | sys/dev/sdmmc/sdmmcreg.h | 3 |
2 files changed, 16 insertions, 3 deletions
diff --git a/sys/dev/sdmmc/sdmmc_mem.c b/sys/dev/sdmmc/sdmmc_mem.c index 7983ed59189..6712c0e490e 100644 --- a/sys/dev/sdmmc/sdmmc_mem.c +++ b/sys/dev/sdmmc/sdmmc_mem.c @@ -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_function *sf, bus_dmamap_t dmap, 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; diff --git a/sys/dev/sdmmc/sdmmcreg.h b/sys/dev/sdmmc/sdmmcreg.h index 51b6a71f5b9..88ddf10a065 100644 --- a/sys/dev/sdmmc/sdmmcreg.h +++ b/sys/dev/sdmmc/sdmmcreg.h @@ -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 */ |
