diff mbox series

[U-Boot,v7,2/2] env: mmc: add erase-function

Message ID 20190629093620.21127-3-frank-w@public-files.de
State Accepted
Commit 3485392506decf3896b7f742c1300cbdf8b31f83
Delegated to: Tom Rini
Headers show
Series add command env erase | expand

Commit Message

Frank Wunderlich June 29, 2019, 9:36 a.m. UTC 
this adds erase environment for mmc storage

squashed fixes:
 - add CONFIG_CMD_ERASEENV
 - env: erase redundant offset if defined
 - changes mentioned by Simon
 - fix whitespaces around errmsg

Suggested-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
---
 env/mmc.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

--
2.17.1

Comments

Simon Goldschmidt July 9, 2019, 7:26 p.m. UTC | #1 
Am 29.06.2019 um 11:36 schrieb Frank Wunderlich:
> this adds erase environment for mmc storage
> 
> squashed fixes:
>   - add CONFIG_CMD_ERASEENV
>   - env: erase redundant offset if defined
>   - changes mentioned by Simon
>   - fix whitespaces around errmsg
> 
> Suggested-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
> Signed-off-by: Frank Wunderlich <frank-w@public-files.de>


Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>

> =2D--
>   env/mmc.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
>   1 file changed, 51 insertions(+)
> 
> diff --git a/env/mmc.c b/env/mmc.c
> index c3cf35d01b..b7b833f423 100644
> =2D-- a/env/mmc.c
> +++ b/env/mmc.c
> @@ -242,6 +242,54 @@ 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 =3D mmc_get_blk_desc(mmc);
> +
> +	blk_start	=3D ALIGN(offset, mmc->write_bl_len) / mmc->write_bl_len;
> +	blk_cnt		=3D ALIGN(size, mmc->write_bl_len) / mmc->write_bl_len;
> +
> +	n =3D blk_derase(desc, blk_start, blk_cnt);
> +	printf("%d blocks erased: %s\n", n, (n =3D=3D blk_cnt) ? "OK" : "ERROR")=
> ;
> +
> +	return (n =3D=3D blk_cnt) ? 0 : 1;
> +}
> +
> +static int env_mmc_erase(void)
> +{
> +	int dev =3D mmc_get_env_dev();
> +	struct mmc *mmc =3D find_mmc_device(dev);
> +	int	ret, copy =3D 0;
> +	u32	offset;
> +	const char *errmsg;
> +
> +	errmsg =3D init_mmc_for_env(mmc);
> +	if (errmsg) {
> +		printf("%s\n", errmsg);
> +		return 1;
> +	}
> +
> +	if (mmc_get_env_addr(mmc, copy, &offset))
> +		return CMD_RET_FAILURE;
> +
> +	ret =3D erase_env(mmc, CONFIG_ENV_SIZE, offset);
> +
> +#ifdef CONFIG_ENV_OFFSET_REDUND
> +	copy =3D 1;
> +
> +	if (mmc_get_env_addr(mmc, copy, &offset))
> +		return CMD_RET_FAILURE;
> +
> +	ret |=3D 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 +399,8 @@ U_BOOT_ENV_LOCATION(mmc) =3D {
>   	.load		=3D env_mmc_load,
>   #ifndef CONFIG_SPL_BUILD
>   	.save		=3D env_save_ptr(env_mmc_save),
> +#if defined(CONFIG_CMD_ERASEENV)
> +	.erase		=3D env_mmc_erase,
> +#endif
>   #endif
>   };
> =2D-
> 2.17.1
>
Tom Rini July 18, 2019, 11:57 p.m. UTC | #2 
On Sat, Jun 29, 2019 at 11:36:20AM +0200, Frank Wunderlich wrote:

> this adds erase environment for mmc storage
> 
> squashed fixes:
>  - add CONFIG_CMD_ERASEENV
>  - env: erase redundant offset if defined
>  - changes mentioned by Simon
>  - fix whitespaces around errmsg
> 
> Suggested-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
> Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
> Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/env/mmc.c b/env/mmc.c
index c3cf35d01b..b7b833f423 100644
--- a/env/mmc.c
+++ b/env/mmc.c
@@ -242,6 +242,54 @@  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) ? 0 : 1;
+}
+
+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;
+	const char *errmsg;
+
+	errmsg = init_mmc_for_env(mmc);
+	if (errmsg) {
+		printf("%s\n", errmsg);
+		return 1;
+	}
+
+	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 +399,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
 };