env: mmc: correct the offset returned by mmc_offset_try_partition

The output of the function mmc_offset_try_partition must be a
byte offset in mmc and not a multiple of blksz.

This function is used in mmc_offset(), called by mmc_get_env_addr()
and the offset is used in write_env(), erase_env() and read_env().

In these function, blk_start = offset / mmc->read_bl_len
or /write_bl_len so this offset is not a multiple of blksz.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
This commit is contained in:
Patrick Delaunay 2020-06-15 10:38:56 +02:00 committed by Tom Rini
parent 2b2f727500
commit 76b640c3f2

4
env/mmc.c vendored
View file

@ -56,10 +56,10 @@ static inline int mmc_offset_try_partition(const char *str, s64 *val)
}
/* round up to info.blksz */
len = (CONFIG_ENV_SIZE + info.blksz - 1) & ~(info.blksz - 1);
len = DIV_ROUND_UP(CONFIG_ENV_SIZE, info.blksz);
/* use the top of the partion for the environment */
*val = (info.start + info.size - 1) - len / info.blksz;
*val = (info.start + info.size - len) * info.blksz;
return 0;
}