Skip to contentSkip to conversation

mmc-utils: Allow for custom sanitize timeout

PATCH Applied Christian Löhle 2 participants 2 messages Oct 13, 2022 – Oct 15, 2022 MMC, SD and SDIO

lore
Share & tools
lore
#0 lore raw

PATCH v3 2/2 mmc-utils: Allow for custom sanitize timeout

Some cards with certain preconditioning require a higher timeout when sanitizing. Let the user set the maximum timeout.

---
 mmc.c      |  2 +-
 mmc_cmds.c | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)
mmc.c +1 -1
index 6c56387..2344879 100644
@@ -150,7 +150,7 @@ static struct Command commands[] = {
 	  NULL
 	},
 	{ do_sanitize, -1,
-	  "sanitize", "<device>\n"
+	  "sanitize", "[timeout_ms] <device>\n"
 		"Send Sanitize command to the <device>.\nThis will delete the unmapped memory region of the device.",
 	  NULL
 	},
mmc_cmds.c +7 -3
index 3337ded..4171dfd 100644
@@ -1986,12 +1986,16 @@ int do_sanitize(int nargs, char **argv)
 {
 	int fd, ret;
 	char *device;
+	unsigned int timeout = 0;
 
-	if (nargs != 2) {
-		fprintf(stderr, "Usage: mmc sanitize </path/to/mmcblkX>\n");
+	if (nargs != 2 && nargs != 3) {
+		fprintf(stderr, "Usage: mmc sanitize [timeout_in_ms] </path/to/mmcblkX>\n");
 		exit(1);
 	}
 
+	if (nargs == 3)
+		timeout = strtol(argv[2], NULL, 10);
+
 	device = argv[1];
 
 	fd = open(device, O_RDWR);
@@ -2000,7 +2004,7 @@ int do_sanitize(int nargs, char **argv)
 		exit(1);
 	}
 
-	ret = write_extcsd_value(fd, EXT_CSD_SANITIZE_START, 1, 0);
+	ret = write_extcsd_value(fd, EXT_CSD_SANITIZE_START, 1, timeout);
 	if (ret) {
 		fprintf(stderr, "Could not write 0x%02x to EXT_CSD[%d] in %s\n",
 			1, EXT_CSD_SANITIZE_START, device);
Signature · 5 lines
2.37.3

Hyperstone GmbH | Reichenaustr. 39a  | 78467 Konstanz
Managing Director: Dr. Jan Peter Berns.
Commercial register of local courts: Freiburg HRB381782
Reviewed-by on v3 2/2
#1 lore raw
Quoted 5 lines

Some cards with certain preconditioning require a higher timeout when sanitizing. Let the user set the maximum timeout.

A nit below. Other than that:

Quoted 18 lines
---
 mmc.c      |  2 +-
 mmc_cmds.c | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)
mmc.c +1 -1
index 6c56387..2344879 100644
@@ -150,7 +150,7 @@ static struct Command commands[] = {
          NULL
        },
        { do_sanitize, -1,
-         "sanitize", "<device>\n"
+         "sanitize", "[timeout_ms] <device>\n"
                "Send Sanitize command to the <device>.\nThis will delete the
 unmapped memory region of the device.",
          NULL
Quoted 1 line
        },

Isn't timeout_ms is your 2nd argument?
Should come 2nd in the documentation as well.

Quoted 7 lines
mmc_cmds.c +0 -0
index 3337ded..4171dfd 100644
@@ -1986,12 +1986,16 @@ int do_sanitize(int nargs, char **argv)
 {
        int fd, ret;

mmc_cmds.c int do_sanitize(int nargs, char **argv) · line 1995

Quoted 10 lines
mmc_cmds.c +3 -2
        char *device;
+       unsigned int timeout = 0;
 
-       if (nargs != 2) {
-               fprintf(stderr, "Usage: mmc sanitize </path/to/mmcblkX>\n");
+       if (nargs != 2 && nargs != 3) {
+               fprintf(stderr, "Usage: mmc sanitize [timeout_in_ms]
 </path/to/mmcblkX>\n");
                exit(1);
        }

Ditto

Thanks,
Avri

Quoted 22 lines
mmc_cmds.c +4 -2
+       if (nargs == 3)
+               timeout = strtol(argv[2], NULL, 10);
+
        device = argv[1];
 
        fd = open(device, O_RDWR);
@@ -2000,7 +2004,7 @@ int do_sanitize(int nargs, char **argv)
                exit(1);
        }
 
-       ret = write_extcsd_value(fd, EXT_CSD_SANITIZE_START, 1, 0);
+       ret = write_extcsd_value(fd, EXT_CSD_SANITIZE_START, 1, timeout);
        if (ret) {
                fprintf(stderr, "Could not write 0x%02x to EXT_CSD[%d] in %s\n",
                        1, EXT_CSD_SANITIZE_START, device);
--

2.37.3

Hyperstone GmbH | Reichenaustr. 39a | 78467 Konstanz Managing Director: Dr. Jan Peter Berns. Commercial register of local courts: Freiburg HRB381782