socfpga: stratix10: fix sdram_calculate_size
Subsystems (3)
PATCH v3 1/1 socfpga: stratix10: fix sdram_calculate_size
Incorrect type of size variable results in 0 being returned for sdram sizes greater than or equal to 4GB.
Signed-off-by Dalon Westergreen <[email protected]>
---
v3: Fix commit message
v2: Move function type to phys_size_t to match gd->ram_size
--- arch/arm/mach-socfpga/include/mach/sdram_s10.h | 2 +- drivers/ddr/altera/sdram_s10.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-socfpga/include/mach/sdram_s10.h +1 -1
@@ -7,7 +7,7 @@#ifndef _SDRAM_S10_H_#define _SDRAM_S10_H_ -unsigned long sdram_calculate_size (void ); +phys_size_t sdram_calculate_size (void );int sdram_mmr_init_full (unsigned int sdr_phy_reg);int sdram_calibration_full (void );
drivers/ddr/altera/sdram_s10.c +2 -2
@@ -371,11 +371,11 @@ int sdram_mmr_init_full(unsigned int unused)* Calculate SDRAM device size based on SDRAM controller parameters. * Size is specified in bytes. */ -unsigned long sdram_calculate_size (void ) +phys_size_t sdram_calculate_size (void ) {u32 dramaddrw =hmc_readl (DRAMADDRW ); - u32 size = 1 << (DRAMADDRW_CFG_CS_ADDR_WIDTH(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) +
Signature · 1 line
2.17.1
PATCH v3 1/1 socfpga: stratix10: fix sdram_calculate_size
Quoted 35 lines · Dalon Westergreen
Incorrect type of size variable results in 0 being returned for sdram sizes greater than or equal to 4GB.
Signed-off-by Dalon Westergreen <[email protected]>---
v3: Fix commit message
v2: Move function type tophys_size_tto matchgd->ram_size--- arch/arm/mach-socfpga/include/mach/sdram_s10.h | 2 +- drivers/ddr/altera/sdram_s10.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)arch/arm/mach-socfpga/include/mach/sdram_s10.h +1
-1@@ -7,7 +7,7 @@#ifndef _SDRAM_S10_H_#define _SDRAM_S10_H_ -unsigned long sdram_calculate_size (void ); +phys_size_t sdram_calculate_size (void );int sdram_mmr_init_full (unsigned int sdr_phy_reg);int sdram_calibration_full (void );drivers/ddr/altera/sdram_s10.c +0
-0@@ -371,11 +371,11 @@ int sdram_mmr_init_full(unsigned int unused)* Calculate SDRAM device size based on SDRAM controller parameters. * Size is specified in bytes. */
drivers/ddr/altera/sdram_s10.c int sdram_mmr_init_full(unsigned int unused) · line 381
Quoted 10 lines
drivers/ddr/altera/sdram_s10.c +2
-2-unsigned long sdram_calculate_size (void ) +phys_size_t sdram_calculate_size (void ) {u32 dramaddrw =hmc_readl (DRAMADDRW ); - u32 size = 1 << (DRAMADDRW_CFG_CS_ADDR_WIDTH(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) +
Updated in socfpga/master, thanks
Signature · 2 lines
Best regards, Marek Vasut