diff mbox series

[RESEND,3/3] env: mmc: add redundancy support in mmc_offset_try_partition

Message ID 20200615103839.RESEND.3.I3f39ef337e2318d7c857e0458d5bc66e374dfaba@changeid
State Superseded
Headers show
Series env: mmc: allow support of mmc_get_env_dev with OF_CONTROL | expand

Commit Message

Patrick Delaunay June 15, 2020, 8:38 a.m. UTC 
Manage 2 copy at the end of the partition selected by config
"u-boot,mmc-env-partition" to save the U-Boot environment,
with CONFIG_ENV_SIZE and 2*CONFIG_ENV_SIZE offset.

This patch allows to support redundancy (CONFIG_ENV_OFFSET_REDUND).

Signed-off-by: Patrick Delaunay <patrick.delaunay at st.com>
---

 env/mmc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Tom Rini July 27, 2020, 1:33 p.m. UTC | #1 
On Mon, Jun 15, 2020 at 10:38:57AM +0200, Patrick Delaunay wrote:

> Manage 2 copy at the end of the partition selected by config

> "u-boot,mmc-env-partition" to save the U-Boot environment,

> with CONFIG_ENV_SIZE and 2*CONFIG_ENV_SIZE offset.

> 

> This patch allows to support redundancy (CONFIG_ENV_OFFSET_REDUND).

> 

> Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>


Applied to u-boot/master, thanks!

-- 
Tom
diff mbox series

Patch

diff --git a/env/mmc.c b/env/mmc.c
index 5de4a45817..aca61b75e9 100644
--- a/env/mmc.c
+++ b/env/mmc.c
@@ -34,7 +34,7 @@  __weak int mmc_get_env_dev(void)
 }
 
 #if CONFIG_IS_ENABLED(OF_CONTROL)
-static inline int mmc_offset_try_partition(const char *str, s64 *val)
+static inline int mmc_offset_try_partition(const char *str, int copy, s64 *val)
 {
 	struct disk_partition info;
 	struct blk_desc *desc;
@@ -59,7 +59,7 @@  static inline int mmc_offset_try_partition(const char *str, s64 *val)
 	len = DIV_ROUND_UP(CONFIG_ENV_SIZE, info.blksz);
 
 	/* use the top of the partion for the environment */
-	*val = (info.start + info.size - len) * info.blksz;
+	*val = (info.start + info.size - (1 + copy) * len) * info.blksz;
 
 	return 0;
 }
@@ -84,7 +84,7 @@  static inline s64 mmc_offset(int copy)
 	str = fdtdec_get_config_string(gd->fdt_blob, dt_prop.partition);
 	if (str) {
 		/* try to place the environment at end of the partition */
-		err = mmc_offset_try_partition(str, &val);
+		err = mmc_offset_try_partition(str, copy, &val);
 		if (!err)
 			return val;
 	}