rockchip: ram: support extend ram top

Signed-off-by: Joseph Chen <[email protected]> Change-Id: I1d8a5e9440071194a1c438345c08e7e2c4d0d3dc
zhangyumingsh · Feb 24, 2022 · d8e6f8d · d8e6f8d
1 parent bdb740d
commit d8e6f8d
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 6 deletions.
diff --git a/arch/arm/include/asm/arch-rockchip/rk_atags.h b/arch/arm/include/asm/arch-rockchip/rk_atags.h
@@ -73,6 +73,9 @@
  */
 #define B1P2_BOOT_CPU_MASK	0x00000fff
 
+/* tag_ddr_mem.flags */
+#define DDR_MEM_FLG_EXT_TOP	1
+
 struct tag_serial {
 	u32 version;
 	u32 enable;
@@ -98,7 +101,8 @@ struct tag_ddr_mem {
 	u32 count;
 	u32 version;
 	u64 bank[20];
-	u32 reserved[3];
+	u32 flags;
+	u32 data[2];
 	u32 hash;
 } __packed;
 

diff --git a/arch/arm/mach-rockchip/param.c b/arch/arm/mach-rockchip/param.c
@@ -280,6 +280,11 @@ struct memblock *param_parse_ddr_mem(int *out_count)
 
 	t = atags_get_tag(ATAG_DDR_MEM);
 	if (t && t->u.ddr_mem.count) {
+		/* extend top ram size */
+		if (t->u.ddr_mem.flags & DDR_MEM_FLG_EXT_TOP)
+			gd->ram_top_ext_size = t->u.ddr_mem.data[0];
+
+		/* normal ram size */
 		count = t->u.ddr_mem.count;
 		mem = calloc(count + MEM_RESV_COUNT, sizeof(*mem));
 		if (!mem) {

diff --git a/cmd/atags.c b/cmd/atags.c
@@ -101,8 +101,9 @@ static void atags_print_tag(struct tag *t)
 		printf("   version = 0x%x\n", t->u.ddr_mem.version);
 		for (i = 0; i < ARRAY_SIZE(t->u.ddr_mem.bank); i++)
 			printf("  bank[%d] = 0x%llx\n", i, t->u.ddr_mem.bank[i]);
-		for (i = 0; i < ARRAY_SIZE(t->u.ddr_mem.reserved); i++)
-			printf("    res[%d] = 0x%x\n", i, t->u.ddr_mem.reserved[i]);
+		printf("     flags = 0x%x\n", t->u.ddr_mem.flags);
+		for (i = 0; i < ARRAY_SIZE(t->u.ddr_mem.data); i++)
+			printf("  data[%d] = 0x%x\n", i, t->u.ddr_mem.data[i]);
 		printf("      hash = 0x%x\n", t->u.ddr_mem.hash);
 		break;
 	case ATAG_RAM_PARTITION:

diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
@@ -67,6 +67,7 @@ typedef struct global_data {
 	unsigned long env_valid;	/* Environment valid? enum env_valid */
 
 	unsigned long ram_top;		/* Top address of RAM used by U-Boot */
+	unsigned long ram_top_ext_size;	/* Extend size of RAM top */
 	unsigned long relocaddr;	/* Start address of U-Boot in RAM */
 	phys_size_t ram_size;		/* RAM size */
 	unsigned long mon_len;		/* monitor len */

diff --git a/lib/bidram.c b/lib/bidram.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <sysmem.h>
 #include <asm/io.h>
+#include <asm/arch/rk_atags.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -140,8 +141,9 @@ void bidram_gen_gd_bi_dram(void)
 	 * Here handle that: there is the only one dram bank available.
 	 */
 	if (rsv_cnt == 1 && !res_rgn[0].base && !res_rgn[0].size) {
-		gd->bd->bi_dram[0].start = mem_rgn[0].base;
-		gd->bd->bi_dram[0].size = mem_rgn[0].size;
+		gd->bd->bi_dram[idx].start = mem_rgn[0].base;
+		gd->bd->bi_dram[idx].size = mem_rgn[0].size;
+		idx++;
 		goto done;
 	}
 
@@ -169,8 +171,23 @@ void bidram_gen_gd_bi_dram(void)
 					    gd->bd->bi_dram[idx].start;
 	}
 done:
-	/* Append 4GB+ memory blocks */
+	/* Append 4GB+ memory blocks and extend ram top */
 	if (bidram->fixup) {
+		/* extend ram top */
+		if (gd->ram_top_ext_size) {
+		        int pos = idx - 1;
+			ulong top;
+
+			if (gd->bd->bi_dram[pos].start +
+			    gd->bd->bi_dram[pos].size == gd->ram_top) {
+				top = gd->bd->bi_dram[pos].start + gd->bd->bi_dram[pos].size;
+				gd->bd->bi_dram[pos].size += gd->ram_top_ext_size;
+				printf("Extend top: 0x%08lx -> 0x%08lx\n",
+				       top, top + (ulong)gd->ram_top_ext_size);
+			}
+		}
+
+		/* append 4GB+ */
 		for (i = 0; i < MEM_RESV_COUNT; i++) {
 			if (!bidram->size_u64[i])
 				continue;
@@ -210,6 +227,9 @@ u64 bidram_append_size(void)
 	for (i = 0; i < MEM_RESV_COUNT; i++)
 		size += bidram->size_u64[i];
 
+	if (gd->ram_top_ext_size)
+		size += gd->ram_top_ext_size;
+
 	return size;
 }