From patchwork Fri Apr 12 09:37:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Wunderlich X-Patchwork-Id: 1084543 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=public-files.de Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="UpNMuChY"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44gXrG5hd4z9ryj for ; Fri, 12 Apr 2019 19:38:06 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 7A22CC21DF9; Fri, 12 Apr 2019 09:37:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id C16FBC21C4A; Fri, 12 Apr 2019 09:37:20 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id F3D76C21CB6; Fri, 12 Apr 2019 09:37:18 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by lists.denx.de (Postfix) with ESMTPS id 99D9AC21C4A for ; Fri, 12 Apr 2019 09:37:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1555061838; bh=7KaWQA6pjlq7TVnrRR7G8WiUAIYno2yoLKuSFLbnmHg=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=UpNMuChYhNKSqMEg8XQh9ptxX37vIthnPNdJko/atCF0rCIAFgKKbAUMIrrb56Whz VzmGDO4am9ZILFUWyxv7WgsdJjLRyUvNzAGMoxyOFOPfrXjLjYkSDPkXlH5bZXVbj/ WUhWfCxfK0dH1G+yQV3FRtVFcMbpz78hQmDQkwHg= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([185.76.99.131]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0MGXV6-1h1hLq10kK-00DEj7; Fri, 12 Apr 2019 11:37:18 +0200 From: Frank Wunderlich To: u-boot@lists.denx.de Date: Fri, 12 Apr 2019 11:37:04 +0200 Message-Id: <20190412093705.10087-2-frank-w@public-files.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190412093705.10087-1-frank-w@public-files.de> References: <20190412093705.10087-1-frank-w@public-files.de> X-Provags-ID: V03:K1:8xaKgxlHkG0qFO3VgPxmoEMuxx84vfb/+B/W49Lh2JzoSfKQyZc YdqJOeq+TyKoOEY7bj7pnCM0AwGG6KULLO9stCr1oydZqpdzayMrj+3bdLZIBUmnWx5OttE QGP+rOa3bSiifxUZeT8fWW/z/frJaiacmo0HwLmmHUQBr94BIejzknsIdEyAJAVwCTCpRy8 MuNnO52enDC9AffViykjg== X-UI-Out-Filterresults: notjunk:1; V03:K0:HdfOAA8TXWI=:gwxzrHOsfPZuUcc3tM7G+V DdHKM3Wn18UeUWQuRjWooz+ZUxD5uVkjcq+zQZqjK+ZfPHiEu1TLvDKQjUjHY9xP10EUaTrtA TzEAXEm1EAkiBL8f/d3T1ghZ9VScuZhJeIryvmnrQ9ioechGsSnlCb9XmN4TnBiEn073wcR7X GGGCgOhyUM+slNitEHb6ZKbS8L2XWr1RGhVjArYi8o3zFcF5t2+QnD+Zy/iOq3aiEjiVEfYcU jxdA2uyYSnlh0Dnb5OxETDynfuILqsysU45ErPZ0RN9Su+dD4y4XnUkj+0rTLKZX1iSRgU4ve 3eED/31yPu2+z9JovV6dzCX+ERWkdjDeCohiwoNb62u6ceWe4VQ+f1x1b58y8+1EDABj2+Fgw jS7R9jHNsFOrlOQat42teNz3dxMInZI+8CKUrYHVVrvYtKRNDhoc+tVdBDwZ9z8MyRxEOwJK/ CxuGSkan/uLv/XQ7h7KXb95NJJReTzZO/dw65emUWduxy6iGbKrQjyre+c/bpz/izgw2iCYhR rAixZmZPcMLaKiTIU8iZu/VeHcfXVepQc8Fd3pPtfvYMVMnHhe5KAMWBvdKuzTaj49TDb8ern fyyyNVR/+7fCpIpxYTuDSBmSVvCYM4iNxu4TDuCTz+hjNEZDx3Lc5EKiPztsQuSxsBTD2m7Yl 2dt0V5+yByFGbeZbG+VH/G4Pbg1sgt3phXlCglV2pm9jEq8N6rVDeVUSaAZTn7/SCDjMmiOir cYyzDGr9+pU3ExXAkE6HfeybHG9nILr9ZkYfA3nxjZJO9uBrRNVXmO7ZldTvxkJUxa8q9AW7o Y5s8D6TCz3f2dD1rxFp0tW/IRw1xYNqvAjii5vFy1qUzYm1hb4cwfLtTnayj3ckZkpG8RPnhQ QJSjocfJFhAHZBJAGdJ/Dpp2GPm4ZODooCDgiiFvp3boxFfxTPbek/T50AtiG8 Subject: [U-Boot] [PATCH v3 1/2] env: register erase command X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Signed-off-by: Frank Wunderlich --- cmd/nvedit.c | 13 +++++++++++++ env/env.c | 30 ++++++++++++++++++++++++++++++ include/environment.h | 17 +++++++++++++++++ 3 files changed, 60 insertions(+) -- 2.17.1 diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 24a6cf7824..3b5c62d629 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -756,11 +756,22 @@ static int do_env_save(cmd_tbl_t *cmdtp, int flag, int argc, return env_save() ? 1 : 0; } +static int do_env_erase(cmd_tbl_t *cmdtp, int flag, int argc, + char * const argv[]) +{ + return env_erase() ? 1 : 0; +} + U_BOOT_CMD( saveenv, 1, 0, do_env_save, "save environment variables to persistent storage", "" ); +U_BOOT_CMD( + eraseenv, 1, 0, do_env_erase, + "erase environment variables from persistent storage", + "" +); #endif #endif /* CONFIG_SPL_BUILD */ @@ -1207,6 +1218,7 @@ static cmd_tbl_t cmd_env_sub[] = { #endif #if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_ENV_IS_NOWHERE) U_BOOT_CMD_MKENT(save, 1, 0, do_env_save, "", ""), + U_BOOT_CMD_MKENT(erase, 1, 0, do_env_erase, "", ""), #endif U_BOOT_CMD_MKENT(set, CONFIG_SYS_MAXARGS, 0, do_env_set, "", ""), #if defined(CONFIG_CMD_ENV_EXISTS) @@ -1282,6 +1294,7 @@ static char env_help_text[] = #endif #if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_ENV_IS_NOWHERE) "env save - save environment\n" + "env erase - erase environment\n" #endif #if defined(CONFIG_CMD_NVEDIT_EFI) "env set -e name [arg ...] - set UEFI variable; unset if 'arg' not specified\n" diff --git a/env/env.c b/env/env.c index 4b417b90a2..25441370e6 100644 --- a/env/env.c +++ b/env/env.c @@ -24,6 +24,8 @@ void env_fix_drivers(void) entry->load += gd->reloc_off; if (entry->save) entry->save += gd->reloc_off; + if (entry->erase) + entry->erase += gd->reloc_off; if (entry->init) entry->init += gd->reloc_off; } @@ -254,6 +256,34 @@ int env_save(void) return -ENODEV; } +int env_erase(void) +{ + struct env_driver *drv; + + drv = env_driver_lookup(ENVOP_ERASE, gd->env_load_prio); + if (drv) { + int ret; + + if (!drv->erase) + return -ENODEV; + + if (!env_has_inited(drv->location)) + return -ENODEV; + + printf("Erase Environment on %s... ", drv->name); + ret = drv->erase(); + if (ret) + printf("Failed (%d)\n", ret); + else + printf("OK\n"); + + if (!ret) + return 0; + } + + return -ENODEV; +} + int env_init(void) { struct env_driver *drv; diff --git a/include/environment.h b/include/environment.h index cd96676141..5024cbea7e 100644 --- a/include/environment.h +++ b/include/environment.h @@ -200,6 +200,7 @@ enum env_operation { ENVOP_INIT, /* we want to call the init function */ ENVOP_LOAD, /* we want to call the load function */ ENVOP_SAVE, /* we want to call the save function */ + ENVOP_ERASE, /* we want to call the erase function */ }; struct env_driver { @@ -225,6 +226,15 @@ struct env_driver { */ int (*save)(void); + /** + * erase() - Erase the environment on storage + * + * This method is required for 'eraseenv' to work. + * + * @return 0 if OK, -ve on error + */ + int (*erase)(void); + /** * init() - Set up the initial pre-relocation environment * @@ -303,6 +313,13 @@ int env_load(void); */ int env_save(void); +/** + * env_erase() - Erase the environment on storage + * + * @return 0 if OK, -ve on error + */ +int env_erase(void); + /** * env_fix_drivers() - Updates envdriver as per relocation */ From patchwork Fri Apr 12 09:37:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Wunderlich X-Patchwork-Id: 1084542 X-Patchwork-Delegate: van.freenix@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=public-files.de Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="W+qLJSvY"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44gXr71ttcz9ryj for ; Fri, 12 Apr 2019 19:37:59 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id F3A45C21E57; Fri, 12 Apr 2019 09:37:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 4A180C21E31; Fri, 12 Apr 2019 09:37:30 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 52A4CC21E3A; Fri, 12 Apr 2019 09:37:22 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by lists.denx.de (Postfix) with ESMTPS id 9EF1CC21DE8 for ; Fri, 12 Apr 2019 09:37:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1555061839; bh=94TvaJ+6eHguELLsTe1hp7nKooMzlR0DMWx1WEm+XLU=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=W+qLJSvYFLIZALw5R14lz/EdjRFaIlSW4ORF1CDrSZ8L98f8y7z6fShgAz4ItG1jM 428HDQQFlnfHNioH2AFCEeG1SQTdoJ+aymaGVI5HaUBtT3K6tY9YVqu3jH/g97deji u0UGqLCaA3CWkoJIJDjlU6pBF6dSuHZrG0kqTR3k= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([185.76.99.131]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0MWxtA-1hKK8B0CPs-00W0b3; Fri, 12 Apr 2019 11:37:19 +0200 From: Frank Wunderlich To: u-boot@lists.denx.de Date: Fri, 12 Apr 2019 11:37:05 +0200 Message-Id: <20190412093705.10087-3-frank-w@public-files.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190412093705.10087-1-frank-w@public-files.de> References: <20190412093705.10087-1-frank-w@public-files.de> X-Provags-ID: V03:K1:zWCQTCnHh3+n45ZcyR89ed7zj/vuea7J4G+eCt7awJ/k7LDimyq VwyHFmLI5V/q+gtihe4gtLfq9FrAaeuNi8WCZpIuvgerqZetpEUiAwefmMwT1pos9lmTBML GSAH1D4CT0ANsQXGv3OPNIkxvgslrzopO3JTKj6k0HDcO4hEWL8afOArHGCpqpWlcbf0Xrl 5W7nDl4hIHKTCR/WXBKGQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:SqenmZKITRM=:g7NQbl2ljpWb+3Rrp0nhyq Fh4u8hDbdC/RVbPpMtLQyKBgQ2S1D5tmwhxhgo+DFufQDB1JgGFtk5u9mDYoLcbZWbA1h4Vmg SKWyxiMA3FQrLvV6q/S1iBALOjpXmnsGEAPCJxcze2UvjibR4NuDgIfGziDh2obo2JKtkF9cd Ko0xP2gy6T1aA4xuwJmbLLjTYAffIvMmzENubQjRtf0MG3ZZcQyH5W0q6ZLAW6TS+5O5P2K7O znSX/WqBy1pn3wM/11TYnYdKiTgHKzBppZ1W4ilohQhH4PigAbsJazkygSDH0zrqmqakSvnu+ Z19W24SiMvyon1F9o1s6v8Jtg+YKIYYXUYw+JYnkChWpVXIkzCWlGDpVgJ7ELmtxZKPBBJYoq HKCSloMkhxl9ppIanVthhAhelPWpHfAvUEuLknZ5MudGYs2JwXWeJAMGYqmdviVy+x3Ascp1r aEgOJSWyuZFmYy1Cl64QJNcMUzBIG48pzHP7sxD13luAPIym21lSnKBDf4MfNmb/ohAwNp48K CdVLkXOfYnLgt8BSvW6C9f0O+SabOXMWHnNaoVnLIdaEMr0JCLCEruzjUS07Ra3Cift/8zcnu 4vD9cC4KdEHKmrosvDxY8D8ABeA7jhEJwr9WnehBVG3WRUJaM8pBfTDS+SIog1aiusbidj1MN NWvk2rZIFzwjwcSxpKPKHmuhhdhpDwHZ02hLjmR/Bxr9wiY1ga7C9Q/ao+aqD9A5ltDObKZJR zJ14hsVLdtdI2aPPVjQ+A5drcajC5AU0JPNVfWYR44zklxjICPBTnxYmZR4Wfeqk1KrYCO4Pt sM5nfsciq1ARzOhVWG5Wtl+rGbcEorNDsCtKmGCkn70YXpSDzZlpwswiYWX3FcwtnZ6CkhCy7 vXT2Ge/0UqJKov4oiGHMzX4eGYtVu6st8Ul3Oxj7jIq7lKW8bVkwR9cXYOmTEX Subject: [U-Boot] [PATCH v3 2/2] env: mmc: add erase-function X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Signed-off-by: Frank Wunderlich --- env/mmc.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) -- 2.17.1 diff --git a/env/mmc.c b/env/mmc.c index c3cf35d01b..f387a53970 100644 --- a/env/mmc.c +++ b/env/mmc.c @@ -242,6 +242,33 @@ fini: fini_mmc_for_env(mmc); return ret; } + +static int env_mmc_erase(void) +{ + int dev = mmc_get_env_dev(); + struct mmc *mmc = find_mmc_device(dev); + int n, blk, cnt; + + if (!mmc) + return CMD_RET_FAILURE; + + blk = CONFIG_ENV_OFFSET / mmc->read_bl_len; + cnt = CONFIG_ENV_SIZE / mmc->read_bl_len; + + printf("\nMMC erase env: dev # %d, block # %d (0x%x), count %d (0x%x)\n", + dev, blk, blk * mmc->read_bl_len, + cnt, cnt * mmc->read_bl_len); + + if (mmc_getwp(mmc) == 1) { + printf("Error: card is write protected!\n"); + return CMD_RET_FAILURE; + } + n = blk_derase(mmc_get_blk_desc(mmc), blk, cnt); + printf("%d blocks erased: %s\n", n, (n == cnt) ? "OK" : "ERROR"); + + return (n == cnt) ? CMD_RET_SUCCESS : CMD_RET_FAILURE; +} + #endif /* CONFIG_CMD_SAVEENV && !CONFIG_SPL_BUILD */ static inline int read_env(struct mmc *mmc, unsigned long size, @@ -351,5 +378,6 @@ U_BOOT_ENV_LOCATION(mmc) = { .load = env_mmc_load, #ifndef CONFIG_SPL_BUILD .save = env_save_ptr(env_mmc_save), + .erase = env_mmc_erase, #endif };