From patchwork Wed Jun 26 10:29:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Wunderlich X-Patchwork-Id: 1122670 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="CTWGd7PM"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45YfY342bbz9sDn for ; Wed, 26 Jun 2019 20:34:47 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 4B85BC21C51; Wed, 26 Jun 2019 10:34:29 +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 5FFB2C21DF8; Wed, 26 Jun 2019 10:34:24 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1026EC21DD4; Wed, 26 Jun 2019 10:34:19 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by lists.denx.de (Postfix) with ESMTPS id E8D22C21D83 for ; Wed, 26 Jun 2019 10:34:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1561545253; bh=ANmtuBAZqh+9WY5waEXVOS11BE8MpBcVmldnA5PtWyA=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=CTWGd7PMQko4x+wsI8Uupqj+ENgiy0V7gGYkILH8J7rr0WYt9Iq6ofnIpJPdb2Ps3 oJQB050BbIplIhS7dAn2FkVpl0iAFPn2+L5sPdlmGoN2c41wPAGmFHanOIL9cMHSyc ijeo2D1OIwzHeh8gDfKpa8m4NzEzqUEpanbz2y/U= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([217.61.152.53]) by mail.gmx.com (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MYNJg-1i1W1n0Yew-00VTNb; Wed, 26 Jun 2019 12:29:09 +0200 From: Frank Wunderlich To: u-boot@lists.denx.de, simon.k.r.goldschmidt@gmail.com Date: Wed, 26 Jun 2019 12:29:01 +0200 Message-Id: <20190626102902.8075-2-frank-w@public-files.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190626102902.8075-1-frank-w@public-files.de> References: <20190626102902.8075-1-frank-w@public-files.de> X-Provags-ID: V03:K1:gmYUbst00J3OLwQbTsDk4mjhBnPPiE/Yc/4UjAkZ5nFUJrq579R 33bGVJEVfbktnWNi4mhjbcuDT9mctmmrAPNqUIx3pxtu/XnqrTB3/QrdpIMzUbr3U5/Y6lX 6uHIgj//3iWsSQRe7Vat4q5lFUqgJP7DGvs8gzPsLeY6g4XbTX/ZmlBmJEmNcCNpq418sGZ YwB1mkC1eu80wALpzsAMQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:ynagGddSpsg=:CKA7elvGctXSj+5XjGR1To dOuv8lTGUiLOOeo+/hUcO6aZelk/4LM9KvQIP22lxneIFMVdGgE6ZRrjGi+zdGSyy5HB2Zxja TTiX9Lktv6wC1In4Htvv8c9WhVX27j+yP2JaagubAeis38Tt6r4trKFAGOpDAvy9fU7GIkAvi OEibu4rgTal3T/7Uwi/FbAtBoOFTXZJMs0HMZQUaseYuk6rN+oSBg+/jYZW6VeqRC7c4iQa+7 lrNAe6RYMyWJLxN9PrVZ/8cYj9Oks4y/7eJ06sFtMgRsKgo/bSStRxri4e56RTydfcAt/3qir iXv01sIRAf3TFaNz7HQW65UazqAOmz0JOH5G70eILpFD8qlxTjtNvnzsmiHfPF+9MO2PHZN2S GqeBge0dpjgVW+bz7Ikti8l1fpY70Z8q9o/X1420TQrsQZFsfpX6pdv7zprR7U46cjXP4dq9A 4zcT6IJpEcunfmFp+x9i4l6TZRORNZliEuPGDYxioP81C96nefRCpU2sM3BWFXlmDoXhhTHl4 7uT5WADV9biTwPxsMk4L/vOJSzX9ZKP+bv/KrMrqkxlihIAaQqmIQhkzyzf5WDSTQcv8tO+mU 8rXAnZ54GEGLU59IVWYXVNJOn7XLqh5nSMMaNNTbWt8u7Cg0ff8owkgSo+FUaaRNnj2BFpTlX DFvmBzSfbXaO8sWmiE1+7if7kYlpbr5a+BYTVTtOyadurS+AhN5cMeFVYv/jHBUeUWBn90tFx S1VG135c2xCEVRGOSolDsUeG0olWMKx9+qka2qvkoN6zPFaoGlBseSo69uJAFuW/2d0zAFOoV tPT7/v/8MyyuFYXEnxeFdRBNVKWQTV2a4PUjewEoQ1127/njxv67e7L7esgbZVG/J5Bovper/ VTvZbmi0IQooyhoT/7vhAIwOh5dXWTNxM0RGQ1G4pUs2X0yKmoiERt03PL3gpvocbbMNBnYTP 3MExBOc+YbCbTE8FFv2EaS2GdZ9WkSAI= Subject: [U-Boot] [PATCH v5 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" this patch adds basic changes for adding a erase-subcommand to env with this command the environment stored on non-volatile storage written by saveenv can be cleared. Signed-off-by: Frank Wunderlich squashed fixes - start message with "Erasing" - mark erase-function as optional - env: separate eraseenv from saveenv Suggested-by: Simon Goldschmidt Reviewed-by: Simon Goldschmidt --- cmd/Kconfig | 8 ++++++++ cmd/nvedit.c | 20 ++++++++++++++++++++ env/env.c | 30 ++++++++++++++++++++++++++++++ include/environment.h | 17 +++++++++++++++++ 4 files changed, 75 insertions(+) -- 2.17.1 diff --git a/cmd/Kconfig b/cmd/Kconfig index 0badcb3fe0..77e8a542d9 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -408,6 +408,14 @@ config CMD_SAVEENV Save all environment variables into the compiled-in persistent storage. +config CMD_ERASEENV + bool "eraseenv" + default n + depends on CMD_SAVEENV + help + Erase environment variables from the compiled-in persistent + storage. + config CMD_ENV_EXISTS bool "env exists" default y diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 52c242b4f6..63de758534 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -761,6 +761,20 @@ U_BOOT_CMD( "save environment variables to persistent storage", "" ); + +#if defined(CONFIG_CMD_ERASEENV) +static int do_env_erase(cmd_tbl_t *cmdtp, int flag, int argc, + char * const argv[]) +{ + return env_erase() ? 1 : 0; +} + +U_BOOT_CMD( + eraseenv, 1, 0, do_env_erase, + "erase environment variables from persistent storage", + "" +); +#endif #endif #endif /* CONFIG_SPL_BUILD */ @@ -1207,6 +1221,9 @@ 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, "", ""), +#if defined(CONFIG_CMD_ERASEENV) + U_BOOT_CMD_MKENT(erase, 1, 0, do_env_erase, "", ""), +#endif #endif U_BOOT_CMD_MKENT(set, CONFIG_SYS_MAXARGS, 0, do_env_set, "", ""), #if defined(CONFIG_CMD_ENV_EXISTS) @@ -1282,6 +1299,9 @@ static char env_help_text[] = #endif #if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_ENV_IS_NOWHERE) "env save - save environment\n" +#if defined(CONFIG_CMD_ERASEENV) + "env erase - erase environment\n" +#endif #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..d3cbe2f915 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("Erasing 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..de67cf4f0e 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 optional and 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 Wed Jun 26 10:29:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Wunderlich X-Patchwork-Id: 1122662 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="Yr7o4Lvr"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45YfQp3NpFz9s3C for ; Wed, 26 Jun 2019 20:29:22 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 0F0D5C21C6A; Wed, 26 Jun 2019 10:29:17 +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 EEAC1C21C3F; Wed, 26 Jun 2019 10:29:15 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 10536C21C3F; Wed, 26 Jun 2019 10:29:14 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by lists.denx.de (Postfix) with ESMTPS id AA684C21C29 for ; Wed, 26 Jun 2019 10:29:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1561544950; bh=vifwBPNSZVDUrQW2Nh6IefzPDfsbwCXLgCiizSAHGf8=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Yr7o4LvrkBfDOemcM7LmUQt87h5LQ0shiHPRtd8ytOlDG/kl72GSV3hSDubN8H08t abMMBd5v9bJ8k+3a1MxCneU2IFxIFcXOgJU9jCrrk7sVd/K0c20rOH+PwiaqOcdTl6 mxZkffcLHxHGSVClvRMLrZXZ9D+NWzy4eATRjSpU= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([217.61.152.53]) by mail.gmx.com (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1M72sP-1heApO3uxD-008Y8c; Wed, 26 Jun 2019 12:29:09 +0200 From: Frank Wunderlich To: u-boot@lists.denx.de, simon.k.r.goldschmidt@gmail.com Date: Wed, 26 Jun 2019 12:29:02 +0200 Message-Id: <20190626102902.8075-3-frank-w@public-files.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190626102902.8075-1-frank-w@public-files.de> References: <20190626102902.8075-1-frank-w@public-files.de> X-Provags-ID: V03:K1:mNPaQutAclWC4xhtAF/MDiQAaB2AgxtO4tbnkVb8if1CnPPHShA MVRe6l8W5Uvw8xSWeID+woWZ96a3mHxg9XnWkbc16xLutFtRWlf+vC+8f/FPEPlJ3RKp420 c9nEZpUml+IzL56+B9hfEIrfQ8KUjlYArQwVjFAZuOONFv1ROS4d65akmkuSHmh89KsU7am 7dyANM/mTfhi5KU2oQqcw== X-UI-Out-Filterresults: notjunk:1; V03:K0:1yQdmmuY3vI=:s+iSdCWfYE6k8q0Pm/Rioo NAsQk8Il9HgRXlAoOj64E5B8kbyXMKHZZcI9T1WcPM78N6wMQcE2WpXzA79L3FZs0F4GsqoPl CdC6M94lNvV6by9ASxub7Uzl/UhMakke9+aUapoC+Tpw+nlgPLsw1iUWDJnJv6avEGczCgH+m +x77KmhdPrAe7LDwDpueqyGwcJ4qmAkHFvKpiJw2fNG4GRaRpFLSMdomhXP6ASN9J8vnuVNTd NF5MQhjyOiyEzPcHwvGI0/xA5SMff7m7RU8U3QLKg3DKXXLt1SciMGq+O1ehOnXqm3qcmsoBO ojq7LthsEYzienUfermU3O/6f3sTPEeZeXOsKvEXy0haAzcTmAu2zdcVIVMr9K9kn8l9OTt6V pSLUdUciWyyxBOwVyyccsxalz/zte2WK+ZBPbih6jVGBLfESg77NbKhj+/MS8Rb7NISK//4se RWTBAKClfWlh06sJMcddMq9LZjqXQihQT0YAAoEOkm1iafCzL5Vx6kze9BuwIbm1tlVxi2ITK H0K2rT9gcQtNW6PLy9nS0EjclXYJRHYLG0kzZwAt7X4z0jMWSmyZli0tIvLUsTAQSKPRZOaoX NnhRjS65mrLNXBIVAK9s1aOSl3SPsI6xTwHNvCOSgbncOpeVWgTgkubB2pv6vg3BOaQ99e73b ACGbGc1UXBKYAzb9BHWDqVCQYnihc5WB5fzvOx8uxoeK6GG5sLYzr/pv/025KEPXItpm4sBfj 0C5UJezhObaYpCxBX+fZa0sMgYi5poYc4SYKIVS0B62QeyBKW5jKWr/W+tPrzuzyltdHSc8Vw yC/K55oYV3ewOigX1Tl+D3x0ZnKnj2rZpDXUlO7dYIH3B2dWZfGubiv7DP2kIqyKMI6kbORiB 6JqgOfW8y6XzBFqJn3Hqi3Vvei8K0LGyx6amtUO9r0of0r/EkWGKFffSsSkopguYgP75TmHWl 8yxKKNdNAa2GBnqUDmN2wCRZnH51wQmE= Subject: [U-Boot] [PATCH v5 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" this adds erase environment for mmc storage squashed fixes: - add CONFIG_CMD_ERASEENV - env: erase redundant offset if defined Suggested-by: Simon Goldschmidt Signed-off-by: Frank Wunderlich --- env/mmc.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) -- 2.17.1 diff --git a/env/mmc.c b/env/mmc.c index c3cf35d01b..da5cf21637 100644 --- a/env/mmc.c +++ b/env/mmc.c @@ -242,6 +242,55 @@ fini: fini_mmc_for_env(mmc); return ret; } + +#if defined(CONFIG_CMD_ERASEENV) +static inline int erase_env(struct mmc *mmc, unsigned long size, + unsigned long offset) +{ + uint blk_start, blk_cnt, n; + struct blk_desc *desc = mmc_get_blk_desc(mmc); + + blk_start = ALIGN(offset, mmc->write_bl_len) / mmc->write_bl_len; + blk_cnt = ALIGN(size, mmc->write_bl_len) / mmc->write_bl_len; + + n = blk_derase(desc, blk_start, blk_cnt); + printf("%d blocks erased: %s\n", n, (n == blk_cnt) ? "OK" : "ERROR"); + + return (n == blk_cnt) ? CMD_RET_SUCCESS : CMD_RET_FAILURE; +} + +static int env_mmc_erase(void) +{ + int dev = mmc_get_env_dev(); + struct mmc *mmc = find_mmc_device(dev); + int ret, copy = 0; + u32 offset; + + if (!mmc) + return CMD_RET_FAILURE; + + if (mmc_getwp(mmc) == 1) { + printf("Error: card is write protected!\n"); + return CMD_RET_FAILURE; + } + + if (mmc_get_env_addr(mmc, copy, &offset)) + return CMD_RET_FAILURE; + + ret = erase_env(mmc, CONFIG_ENV_SIZE, offset); + +#ifdef CONFIG_ENV_OFFSET_REDUND + copy = 1; + + if (mmc_get_env_addr(mmc, copy, &offset)) + return CMD_RET_FAILURE; + + ret |= erase_env(mmc, CONFIG_ENV_SIZE, offset); +#endif + + return ret; +} +#endif /* CONFIG_CMD_ERASEENV */ #endif /* CONFIG_CMD_SAVEENV && !CONFIG_SPL_BUILD */ static inline int read_env(struct mmc *mmc, unsigned long size, @@ -351,5 +400,8 @@ U_BOOT_ENV_LOCATION(mmc) = { .load = env_mmc_load, #ifndef CONFIG_SPL_BUILD .save = env_save_ptr(env_mmc_save), +#if defined(CONFIG_CMD_ERASEENV) + .erase = env_mmc_erase, +#endif #endif };