From: Bin Meng <bmeng.cn@gmail.com>
Date: Fri, 22 Jun 2018 08:38:30 +0000 (-0700)
Subject: x86: efi: payload: Count in conventional memory above 4GB in DRAM bank
X-Git-Tag: v2018.07-rc3~18^2~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=598374729e6b3f3070e06bdf2990dd8d10cddbda;p=oweals%2Fu-boot.git

x86: efi: payload: Count in conventional memory above 4GB in DRAM bank

At present in dram_init_banksize() it ignores conventional memory
above 4GB. This leads to wrong DRAM size is printed during boot.
Remove such limitation.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/arch/x86/cpu/efi/payload.c b/arch/x86/cpu/efi/payload.c
index e3f0f825f3..4649bfe86e 100644
--- a/arch/x86/cpu/efi/payload.c
+++ b/arch/x86/cpu/efi/payload.c
@@ -109,11 +109,10 @@ int dram_init_banksize(void)
 	     desc < end && num_banks < CONFIG_NR_DRAM_BANKS;
 	     desc = efi_get_next_mem_desc(map, desc)) {
 		/*
-		 * We only use conventional memory below 4GB, and ignore
+		 * We only use conventional memory and ignore
 		 * anything less than 1MB.
 		 */
 		if (desc->type != EFI_CONVENTIONAL_MEMORY ||
-		    desc->physical_start >= 1ULL << 32 ||
 		    (desc->num_pages << EFI_PAGE_SHIFT) < 1 << 20)
 			continue;
 		gd->bd->bi_dram[num_banks].start = desc->physical_start;