Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / x86 / lib / fsp / fsp_dram.c

diff --git a/arch/x86/lib/fsp/fsp_dram.c b/arch/x86/lib/fsp/fsp_dram.c
index 1a7af576d549c55c06b930bad34eb60c3b383a44..ad5a0f79adf76bc90969862572dd059dfcb6c49a 100644 (file)
--- a/arch/x86/lib/fsp/fsp_dram.c
+++ b/arch/x86/lib/fsp/fsp_dram.c
@@ -1,18 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <handoff.h>
+#include <init.h>
+#include <log.h>
 #include <asm/fsp/fsp_support.h>
 #include <asm/e820.h>
 #include <asm/mrccache.h>
+#include <asm/mtrr.h>
 #include <asm/post.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-int dram_init(void)
+int fsp_scan_for_ram_size(void)
 {
        phys_size_t ram_size = 0;
        const struct hob_header *hdr;
@@ -23,9 +26,8 @@ int dram_init(void)
                if (hdr->type == HOB_TYPE_RES_DESC) {
                        res_desc = (struct hob_res_desc *)hdr;
                        if (res_desc->type == RES_SYS_MEM ||
-                           res_desc->type == RES_MEM_RESERVED) {
+                           res_desc->type == RES_MEM_RESERVED)
                                ram_size += res_desc->len;
-                       }
                }
                hdr = get_next_hob(hdr);
        }
@@ -33,38 +35,61 @@ int dram_init(void)
        gd->ram_size = ram_size;
        post_code(POST_DRAM);
 
-#ifdef CONFIG_ENABLE_MRC_CACHE
-       gd->arch.mrc_output = fsp_get_nvs_data(gd->arch.hob_list,
-                                              &gd->arch.mrc_output_len);
-#endif
-
        return 0;
-}
+};
 
 int dram_init_banksize(void)
 {
+       const struct hob_header *hdr;
+       struct hob_res_desc *res_desc;
+       phys_addr_t low_end;
+       uint bank;
+
+       if (!ll_boot_init()) {
+               gd->bd->bi_dram[0].start = 0;
+               gd->bd->bi_dram[0].size = gd->ram_size;
+
+               mtrr_add_request(MTRR_TYPE_WRBACK, 0, gd->ram_size);
+               return 0;
+       }
+
+       low_end = 0;
+       for (bank = 1, hdr = gd->arch.hob_list;
+            bank < CONFIG_NR_DRAM_BANKS && !end_of_hob(hdr);
+            hdr = get_next_hob(hdr)) {
+               if (hdr->type != HOB_TYPE_RES_DESC)
+                       continue;
+               res_desc = (struct hob_res_desc *)hdr;
+               if (res_desc->type != RES_SYS_MEM &&
+                   res_desc->type != RES_MEM_RESERVED)
+                       continue;
+               if (res_desc->phys_start < (1ULL << 32)) {
+                       low_end = max(low_end,
+                                     res_desc->phys_start + res_desc->len);
+                       continue;
+               }
+
+               gd->bd->bi_dram[bank].start = res_desc->phys_start;
+               gd->bd->bi_dram[bank].size = res_desc->len;
+               mtrr_add_request(MTRR_TYPE_WRBACK, res_desc->phys_start,
+                                res_desc->len);
+               log_debug("ram %llx %llx\n", gd->bd->bi_dram[bank].start,
+                         gd->bd->bi_dram[bank].size);
+       }
+
+       /* Add the memory below 4GB */
        gd->bd->bi_dram[0].start = 0;
-       gd->bd->bi_dram[0].size = gd->ram_size;
+       gd->bd->bi_dram[0].size = low_end;
 
-       return 0;
-}
+       mtrr_add_request(MTRR_TYPE_WRBACK, 0, low_end);
 
-/*
- * This function looks for the highest region of memory lower than 4GB which
- * has enough space for U-Boot where U-Boot is aligned on a page boundary.
- * It overrides the default implementation found elsewhere which simply
- * picks the end of ram, wherever that may be. The location of the stack,
- * the relocation address, and how far U-Boot is moved by relocation are
- * set in the global data structure.
- */
-ulong board_get_usable_ram_top(ulong total_size)
-{
-       return fsp_get_usable_lowmem_top(gd->arch.hob_list);
+       return 0;
 }
 
-unsigned install_e820_map(unsigned max_entries, struct e820entry *entries)
+unsigned int install_e820_map(unsigned int max_entries,
+                             struct e820_entry *entries)
 {
-       unsigned num_entries = 0;
+       unsigned int num_entries = 0;
        const struct hob_header *hdr;
        struct hob_res_desc *res_desc;
 
@@ -98,7 +123,7 @@ unsigned install_e820_map(unsigned max_entries, struct e820entry *entries)
         * reserved in order for ACPI S3 resume to work.
         */
        entries[num_entries].addr = gd->start_addr_sp - CONFIG_STACK_SIZE;
-       entries[num_entries].size = gd->ram_top - gd->start_addr_sp + \
+       entries[num_entries].size = gd->ram_top - gd->start_addr_sp +
                CONFIG_STACK_SIZE;
        entries[num_entries].type = E820_RESERVED;
        num_entries++;
@@ -106,3 +131,13 @@ unsigned install_e820_map(unsigned max_entries, struct e820entry *entries)
 
        return num_entries;
 }
+
+#if CONFIG_IS_ENABLED(HANDOFF) && IS_ENABLED(CONFIG_USE_HOB)
+int handoff_arch_save(struct spl_handoff *ho)
+{
+       ho->arch.usable_ram_top = fsp_get_usable_lowmem_top(gd->arch.hob_list);
+       ho->arch.hob_list = gd->arch.hob_list;
+
+       return 0;
+}
+#endif