[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 2/6] hw/misc/allwinner-h3-dramc: enforce 64-bit multiply when calc
From: |
Peter Maydell |
Subject: |
[PULL 2/6] hw/misc/allwinner-h3-dramc: enforce 64-bit multiply when calculating row mirror address |
Date: |
Mon, 30 Mar 2020 14:36:44 +0100 |
From: Niek Linnenbank <address@hidden>
The allwinner_h3_dramc_map_rows function simulates row addressing behavior
when bootloader software attempts to detect the amount of available SDRAM.
Currently the line that calculates the 64-bit address of the mirrored row
uses a signed 32-bit multiply operation that in theory could result in the
upper 32-bit be all 1s. This commit ensures that the row mirror address
is calculated using only 64-bit operations.
Reported-by: Peter Maydell <address@hidden>
Signed-off-by: Niek Linnenbank <address@hidden>
Message-id: address@hidden
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
hw/misc/allwinner-h3-dramc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/misc/allwinner-h3-dramc.c b/hw/misc/allwinner-h3-dramc.c
index 2b5260260e7..1d37cf422cd 100644
--- a/hw/misc/allwinner-h3-dramc.c
+++ b/hw/misc/allwinner-h3-dramc.c
@@ -85,8 +85,8 @@ static void allwinner_h3_dramc_map_rows(AwH3DramCtlState *s,
uint8_t row_bits,
} else if (row_bits_actual) {
/* Row bits not matching ram_size, install the rows mirror */
- hwaddr row_mirror = s->ram_addr + ((1 << (row_bits_actual +
- bank_bits)) * page_size);
+ hwaddr row_mirror = s->ram_addr + ((1ULL << (row_bits_actual +
+ bank_bits)) * page_size);
memory_region_set_enabled(&s->row_mirror_alias, true);
memory_region_set_address(&s->row_mirror_alias, row_mirror);
--
2.20.1
- [PULL 0/6] target-arm queue, Peter Maydell, 2020/03/30
- [PULL 2/6] hw/misc/allwinner-h3-dramc: enforce 64-bit multiply when calculating row mirror address,
Peter Maydell <=
- [PULL 1/6] hw/arm/orangepi: check for potential NULL pointer when calling blk_is_available, Peter Maydell, 2020/03/30
- [PULL 3/6] docs/conf.py: Raise ConfigError for bad Sphinx Python version, Peter Maydell, 2020/03/30
- [PULL 4/6] hw/arm/xlnx-zynqmp.c: Avoid memory leak in error-return path, Peter Maydell, 2020/03/30
- [PULL 5/6] hw/arm/xlnx-zynqmp.c: Add missing error-propagation code, Peter Maydell, 2020/03/30
- [PULL 6/6] target/arm: fix incorrect current EL bug in aarch32 exception emulation, Peter Maydell, 2020/03/30
- Re: [PULL 0/6] target-arm queue, Peter Maydell, 2020/03/30