rockchip/rk3399: sdram: use register to calculate sdram sizes

We may support different sdram sizes on one board in future, so
we need to calculate sdram sizes from sdram drvier.

BRANCH=None
BUG=None
TEST=boot kevin

Change-Id: I43e8f164ecdb768c051464b4dbc7d890df8055d0
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 3c4d8b3cb647b2f9cebc416c298817c16d49330e
Original-Change-Id: I95d5ef34de9d79ebca3600dc7a4b9e14449606ff
Original-Signed-off-by: Lin Huang <hl@rock-chips.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/411600
Original-Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/17629
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
Lin Huang 2016-11-15 11:40:58 +08:00 committed by Martin Roth
parent c49782cbe7
commit f00af5833a
4 changed files with 41 additions and 11 deletions

View File

@ -60,10 +60,6 @@ config MAINBOARD_VENDOR
string string
default "Google" default "Google"
config DRAM_SIZE_MB
int
default 4096
config EC_GOOGLE_CHROMEEC_SPI_BUS config EC_GOOGLE_CHROMEEC_SPI_BUS
hex hex
default 0x5 default 0x5

View File

@ -33,9 +33,6 @@
#include "pwm_regulator.h" #include "pwm_regulator.h"
static const uint64_t dram_size =
(uint64_t)min((uint64_t)CONFIG_DRAM_SIZE_MB * MiB, MAX_DRAM_ADDRESS);
static void init_dvs_outputs(void) static void init_dvs_outputs(void)
{ {
pwm_regulator_configure(PWM_REGULATOR_GPU, 900); pwm_regulator_configure(PWM_REGULATOR_GPU, 900);
@ -66,7 +63,8 @@ void main(void)
sdram_init(get_sdram_config()); sdram_init(get_sdram_config());
mmu_config_range((void *)0, (uintptr_t)dram_size, CACHED_MEM); mmu_config_range((void *)0, (uintptr_t)sdram_size_mb() * MiB,
CACHED_MEM);
mmu_config_range(_dma_coherent, _dma_coherent_size, UNCACHED_MEM); mmu_config_range(_dma_coherent, _dma_coherent_size, UNCACHED_MEM);
cbmem_initialize_empty(); cbmem_initialize_empty();
run_ramstage(); run_ramstage();

View File

@ -1031,5 +1031,41 @@ void sdram_init(const struct rk3399_sdram_params *sdram_params)
size_t sdram_size_mb(void) size_t sdram_size_mb(void)
{ {
return CONFIG_DRAM_SIZE_MB; u32 rank, col, bk, cs0_row, cs1_row, bw, row_3_4;
size_t chipsize_mb = 0;
static size_t size_mb = 0;
u32 ch;
if (!size_mb) {
u32 sys_reg = read32(&rk3399_pmugrf->os_reg2);
u32 ch_num = SYS_REG_DEC_NUM_CH(sys_reg);
for (ch = 0; ch < ch_num; ch++) {
rank = SYS_REG_DEC_RANK(sys_reg, ch);
col = SYS_REG_DEC_COL(sys_reg, ch);
bk = SYS_REG_DEC_BK(sys_reg, ch);
cs0_row = SYS_REG_DEC_CS0_ROW(sys_reg, ch);
cs1_row = SYS_REG_DEC_CS1_ROW(sys_reg, ch);
bw = SYS_REG_DEC_BW(sys_reg, ch);
row_3_4 = SYS_REG_DEC_ROW_3_4(sys_reg, ch);
chipsize_mb = (1 << (cs0_row + col + bk + bw - 20));
if (rank > 1)
chipsize_mb += chipsize_mb >>
(cs0_row - cs1_row);
if (row_3_4)
chipsize_mb = chipsize_mb * 3 / 4;
size_mb += chipsize_mb;
}
/*
* we use the 0x00000000~0xf7ffffff space
* since 0xf8000000~0xffffffff is soc register space
* so we reserve it
*/
size_mb = MIN(size_mb, 0xf8000000/MiB);
}
return size_mb;
} }

View File

@ -20,6 +20,7 @@
#include <soc/addressmap.h> #include <soc/addressmap.h>
#include <soc/clock.h> #include <soc/clock.h>
#include <soc/display.h> #include <soc/display.h>
#include <soc/sdram.h>
#include <stddef.h> #include <stddef.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -27,8 +28,7 @@
static void soc_read_resources(device_t dev) static void soc_read_resources(device_t dev)
{ {
ram_resource(dev, 0, (uintptr_t)_dram / KiB, ram_resource(dev, 0, (uintptr_t)_dram / KiB, sdram_size_mb() * KiB);
min(CONFIG_DRAM_SIZE_MB * KiB, MAX_DRAM_ADDRESS / KiB));
} }
static void soc_init(device_t dev) static void soc_init(device_t dev)