From patchwork Wed Oct 12 19:03:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Loehle X-Patchwork-Id: 13005386 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2166CC4332F for ; Wed, 12 Oct 2022 19:03:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229933AbiJLTDz convert rfc822-to-8bit (ORCPT ); Wed, 12 Oct 2022 15:03:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229533AbiJLTDu (ORCPT ); Wed, 12 Oct 2022 15:03:50 -0400 Received: from mail4.swissbit.com (mail4.swissbit.com [176.95.1.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6DC18923E7 for ; Wed, 12 Oct 2022 12:03:49 -0700 (PDT) Received: from mail4.swissbit.com (localhost [127.0.0.1]) by DDEI (Postfix) with ESMTP id EBACC123630; Wed, 12 Oct 2022 21:03:47 +0200 (CEST) Received: from mail4.swissbit.com (localhost [127.0.0.1]) by DDEI (Postfix) with ESMTP id DBE5512117D; Wed, 12 Oct 2022 21:03:47 +0200 (CEST) X-TM-AS-ERS: 10.149.2.42-127.5.254.253 X-TM-AS-SMTP: 1.0 ZXguc3dpc3NiaXQuY29t Y2xvZWhsZUBoeXBlcnN0b25lLmNvbQ== X-DDEI-TLS-USAGE: Used Received: from ex.swissbit.com (unknown [10.149.2.42]) by mail4.swissbit.com (Postfix) with ESMTPS; Wed, 12 Oct 2022 21:03:47 +0200 (CEST) Received: from sbdeex04.sbitdom.lan (10.149.2.42) by sbdeex04.sbitdom.lan (10.149.2.42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.9; Wed, 12 Oct 2022 21:03:47 +0200 Received: from sbdeex04.sbitdom.lan ([fe80::2047:4968:b5a0:1818]) by sbdeex04.sbitdom.lan ([fe80::2047:4968:b5a0:1818%9]) with mapi id 15.02.1118.009; Wed, 12 Oct 2022 21:03:47 +0200 From: =?iso-8859-1?q?Christian_L=F6hle?= To: Avri Altman , Ulf Hansson , Linux MMC List Subject: [PATCHv2 2/2] mmc-utils: Allow for custom sanitize timeout Thread-Topic: [PATCHv2 2/2] mmc-utils: Allow for custom sanitize timeout Thread-Index: AdjebT+JHTIs+xD6T9C4QGSkcmZAKg== Date: Wed, 12 Oct 2022 19:03:47 +0000 Message-ID: <19c0abf89a5d4f039cd02f2c14272077@hyperstone.com> Accept-Language: en-US, de-DE Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.242.2.2] MIME-Version: 1.0 X-TMASE-Version: DDEI-5.1-9.0.1002-27198.002 X-TMASE-Result: 10-3.377300-10.000000 X-TMASE-MatchedRID: BFQSNthdAqJINlHl+WuFyhqkhv3OdF4DrzD8YrC59vxGQgIVrmBL5OqO SOOdRR5ajx5X3FdI4UDmn3xyPJAJoh2P280ZiGmR8IK7yRWPRNEYH39vFLryE9MvYZEcBz1xvnV hS/vsz71qWLOxXAxgglX71r5lUalZaDAi8sBNMoELbigRnpKlKSPzRlrdFGDwoGZb8eEdLinTfd TQuY4l9gXgWc6fGv+coXoY5THXtkuVgoAo1GD2rQ== X-TMASE-SNAP-Result: 1.821001.0001-0-1-22:0,33:0,34:0-0 X-TMASE-INERTIA: 0-0;;;; X-TMASE-XGENCLOUD: 3e576fdd-a53e-413c-ae71-d9bf6aae2199-0-0-200-0 Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org Some cards with certain preconditioning require a higher timeout when sanitizing. Let the user set the maximum timeout. Signed-off-by: Christian Loehle --- mmc.c | 2 +- mmc_cmds.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mmc.c b/mmc.c index 6c56387..2344879 100644 --- a/mmc.c +++ b/mmc.c @@ -150,7 +150,7 @@ static struct Command commands[] = { NULL }, { do_sanitize, -1, - "sanitize", "\n" + "sanitize", "[timeout_ms] \n" "Send Sanitize command to the .\nThis will delete the unmapped memory region of the device.", NULL }, diff --git a/mmc_cmds.c b/mmc_cmds.c index 8bc7a56..8546a3f 100644 --- a/mmc_cmds.c +++ b/mmc_cmds.c @@ -2007,12 +2007,16 @@ int do_sanitize(int nargs, char **argv) { int fd, ret; char *device; + unsigned int timeout = SWITCH_TIMEOUT_MS; - if (nargs != 2) { - fprintf(stderr, "Usage: mmc sanitize \n"); + if (nargs != 2 && nargs != 3) { + fprintf(stderr, "Usage: mmc sanitize [timeout_in_ms] \n"); exit(1); } + if (nargs == 3) + timeout = strtol(argv[2], NULL, 10); + device = argv[1]; fd = open(device, O_RDWR); @@ -2021,8 +2025,7 @@ int do_sanitize(int nargs, char **argv) exit(1); } - ret = write_extcsd_value(fd, EXT_CSD_SANITIZE_START, 1, - SWITCH_TIMEOUT_MS); + 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);