UPSTREAM: fix ENH_START_ADDR overflow
Fix enh_start_addr overflow when converting emmc enh_area which will
cause do_enh_area_set failure.
BUG=None
TEST=Compile
Signed-off-by: jason.zeng <jasonzvz@gmail.com>
Signed-off-by: Chris Ball <chris@printf.net>
(cherry picked from commit b4fe0c8c0e57a74c01755fa9362703b60d7ee49d)
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Change-Id: I6cfb0ca7237891058b90d989cac9c1330352eda5
Reviewed-on: https://chromium-review.googlesource.com/1114457
Commit-Ready: Gwendal Grignou <gwendal@chromium.org>
Tested-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
diff --git a/mmc_cmds.c b/mmc_cmds.c
index 92a01d6..6229292 100644
--- a/mmc_cmds.c
+++ b/mmc_cmds.c
@@ -1168,7 +1168,7 @@
enh_size_mult = (length_kib + align/2l) / align;
- enh_start_addr = start_kib * 1024 / (is_blockaddresed(ext_csd) ? 512 : 1);
+ enh_start_addr = start_kib * (1024 / (is_blockaddresed(ext_csd) ? 512 : 1));
enh_start_addr /= align;
enh_start_addr *= align;
@@ -1766,9 +1766,9 @@
(ext_csd[EXT_CSD_ENH_START_ADDR_1] << 8) |
ext_csd[EXT_CSD_ENH_START_ADDR_0];
printf("Enhanced User Data Start Address"
- " [ENH_START_ADDR]: 0x%06x\n", regl);
- printf(" i.e. %lu bytes offset\n", (is_blockaddresed(ext_csd) ?
- 512l : 1l) * regl);
+ " [ENH_START_ADDR]: 0x%08x\n", regl);
+ printf(" i.e. %llu bytes offset\n", (is_blockaddresed(ext_csd) ?
+ 512ll : 1ll) * regl);
/* A441]: reserved [135] */
printf("Bad Block Management mode"
