ddr: socfpga: Fix integer overflow that caused DDR size mismatched
PATCH 1/1 ddr: socfpga: Fix integer overflow that caused DDR size mismatched
From: Tien Fong Chee <[email protected]>
Convert the constant integer to 'phys_size_t' to avoid overflow when calculating the SDRAM size.
--- drivers/ddr/altera/sdram_soc64.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/ddr/altera/sdram_soc64.c +8 -7
@@ -218,13 +218,14 @@ phys_size_t sdram_calculate_size(struct altera_sdram_platdata *plat) {u32 dramaddrw =hmc_readl (plat,DRAMADDRW ); -phys_size_t size =1 << (DRAMADDRW_CFG_CS_ADDR_WIDTH (dramaddrw) + -DRAMADDRW_CFG_BANK_GRP_ADDR_WIDTH (dramaddrw) + -DRAMADDRW_CFG_BANK_ADDR_WIDTH (dramaddrw) + -DRAMADDRW_CFG_ROW_ADDR_WIDTH (dramaddrw) + -DRAMADDRW_CFG_COL_ADDR_WIDTH (dramaddrw)); - - size *= (2 << (hmc_ecc_readl (plat,DDRIOCTRL ) & +phys_size_t size = (phys_size_t )1 << + (DRAMADDRW_CFG_CS_ADDR_WIDTH (dramaddrw) + +DRAMADDRW_CFG_BANK_GRP_ADDR_WIDTH (dramaddrw) + +DRAMADDRW_CFG_BANK_ADDR_WIDTH (dramaddrw) + +DRAMADDRW_CFG_ROW_ADDR_WIDTH (dramaddrw) + +DRAMADDRW_CFG_COL_ADDR_WIDTH (dramaddrw)); + + size *= ((phys_size_t )2 << (hmc_ecc_readl (plat,DDRIOCTRL ) &DDR_HMC_DDRIOCTRL_IOSIZE_MSK ));return size;
Signature · 1 line
2.13.0
Tan
PATCH 1/1 ddr: socfpga: Fix integer overflow that caused DDR size mismatched
Quoted 16 lines
-----Original Message-----
From: Chee, Tien Fong <[email protected]>
Sent: Wednesday, August 5, 2020 11:59 AM
To: u-boot at lists.denx.de
Cc: Simon Goldschmidt <[email protected]>; Marek Vasut <[email protected]>; See, Chin Liang <[email protected]>; Tan, Ley Foon <[email protected]>; Lim, Elly Siew Chin <[email protected]>; Ang, Chee Hong <[email protected]>; Chee, Tien Fong <[email protected]>
Subject: [PATCH] ddr: socfpga: Fix integer overflow that caused DDR size mismatchedFrom: Tien Fong Chee <[email protected]>
Quoted 7 lines
Convert the constant integer to '
phys_size_t' to avoid overflow when calculating the SDRAM size.Signed-off-by Tien Fong Chee <[email protected]>--- drivers/ddr/altera/sdram_soc64.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
Regards
Ley Foon