Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 07:31:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

board: nuvuton: arbel: Fix incorrect ram size

Browse source 
1. Fix incorrect ram size of 4GB dram with ECC enabled
2. Fix wrong place to set dram bank size
   - The dram bank size should be set in dram_init_banksize
   - Dram_init should not access gd->bd because the board info
     struct is not reserved yet.

Signed-off-by: Jim Liu <JJLIU0@nuvoton.com>
[trini: Rework slightly]
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Jim Liu 2023-10-23 15:02:24 +08:00 committed by Tom Rini
parent 1af3e71972
commit 1b7026f5f8
1 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
board/nuvoton/arbel_evb/arbel_evb.c
View file

@ -16,7 +16,7 @@
#define DRAM_1GB_SIZE 0x40000000ULL #define DRAM_1GB_SIZE 0x40000000ULL
#define DRAM_2GB_ECC_SIZE 0x70000000ULL #define DRAM_2GB_ECC_SIZE 0x70000000ULL
#define DRAM_2GB_SIZE 0x80000000ULL #define DRAM_2GB_SIZE 0x80000000ULL
#define DRAM_4GB_ECC_SIZE 0xE00000000ULL #define DRAM_4GB_ECC_SIZE 0xE0000000ULL
#define DRAM_4GB_SIZE 0x100000000ULL #define DRAM_4GB_SIZE 0x100000000ULL
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -29,7 +29,6 @@ int board_init(void)
int dram_init(void) int dram_init(void)
{ {
struct npcm_gcr *gcr = (struct npcm_gcr *)NPCM_GCR_BA; struct npcm_gcr *gcr = (struct npcm_gcr *)NPCM_GCR_BA;
uint64_t delta = 0ULL;
/* /*
* get dram active size value from bootblock. * get dram active size value from bootblock.
@ -38,17 +37,21 @@ int dram_init(void)
*/ */
gd->ram_size = readl(&gcr->scrpad_c); gd->ram_size = readl(&gcr->scrpad_c);
debug("%s: scrpad_c: %llx ", __func__, gd->ram_size);
if (gd->ram_size == 0) { if (gd->ram_size == 0)
gd->ram_size = readl(&gcr->scrpad_b); gd->ram_size = readl(&gcr->scrpad_b);
debug("%s: scrpad_b: %llx ", __func__, gd->ram_size); else
} else {
gd->ram_size *= 0x100000ULL; gd->ram_size *= 0x100000ULL;
}
debug("ram_size: %llx ", gd->ram_size);
return 0;
}
int dram_init_banksize(void)
{
gd->bd->bi_dram[0].start = 0; gd->bd->bi_dram[0].start = 0;
debug("ram_size: %llx ", gd->ram_size);
switch (gd->ram_size) { switch (gd->ram_size) {
case DRAM_512MB_ECC_SIZE: case DRAM_512MB_ECC_SIZE:
@ -62,32 +65,28 @@ int dram_init(void)
gd->bd->bi_dram[1].size = 0; gd->bd->bi_dram[1].size = 0;
break; break;
case DRAM_4GB_ECC_SIZE: case DRAM_4GB_ECC_SIZE:
gd->bd->bi_dram[0].size = DRAM_2GB_ECC_SIZE; gd->bd->bi_dram[0].size = DRAM_2GB_SIZE;
gd->bd->bi_dram[1].start = DRAM_4GB_SIZE; gd->bd->bi_dram[1].start = DRAM_4GB_SIZE;
gd->bd->bi_dram[1].size = DRAM_2GB_SIZE; gd->bd->bi_dram[1].size = DRAM_2GB_SIZE -
delta = DRAM_4GB_SIZE - DRAM_2GB_ECC_SIZE; (DRAM_4GB_SIZE - DRAM_4GB_ECC_SIZE);
/* use bank0 only */
gd->ram_size = DRAM_2GB_SIZE;
break; break;
case DRAM_4GB_SIZE: case DRAM_4GB_SIZE:
gd->bd->bi_dram[0].size = DRAM_2GB_SIZE; gd->bd->bi_dram[0].size = DRAM_2GB_SIZE;
gd->bd->bi_dram[1].start = DRAM_4GB_SIZE; gd->bd->bi_dram[1].start = DRAM_4GB_SIZE;
gd->bd->bi_dram[1].size = DRAM_2GB_SIZE; gd->bd->bi_dram[1].size = DRAM_2GB_SIZE;
delta = DRAM_4GB_SIZE - DRAM_2GB_SIZE; /* use bank0 only */
gd->ram_size = DRAM_2GB_SIZE;
break; break;
default: default:
gd->bd->bi_dram[0].size = DRAM_1GB_SIZE; gd->bd->bi_dram[0].size = DRAM_1GB_SIZE;
gd->bd->bi_dram[1].start = 0; gd->bd->bi_dram[1].start = 0;
gd->bd->bi_dram[1].size = 0; gd->bd->bi_dram[1].size = 0;
gd->ram_size = DRAM_1GB_SIZE;
break; break;
} }
gd->ram_size -= delta;
return 0; return 0;
} }
int dram_init_banksize(void)
{
dram_init();
return 0;
}