bootstage: Support relocating boostage data

Some boards cannot access pre-relocation data after relocation. Reserve
space for this and copy it during preparation for relocation.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/common/board_f.c b/common/board_f.c
index 783c51a68577e988455fae181e76ea45a59e56fc..14abb428144e665b0b7dc109b055dd7a7bb2375c 100644 (file)
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -491,6 +491,20 @@ static int reserve_fdt(void)
        return 0;
 }
 
+static int reserve_bootstage(void)
+{
+#ifdef CONFIG_BOOTSTAGE
+       int size = bootstage_get_size();
+
+       gd->start_addr_sp -= size;
+       gd->new_bootstage = map_sysmem(gd->start_addr_sp, size);
+       debug("Reserving %#x Bytes for bootstage at: %08lx\n", size,
+             gd->start_addr_sp);
+#endif
+
+       return 0;
+}
+
 int arch_reserve_stacks(void)
 {
        return 0;
@@ -605,6 +619,24 @@ static int reloc_fdt(void)
        return 0;
 }
 
+static int reloc_bootstage(void)
+{
+#ifdef CONFIG_BOOTSTAGE
+       if (gd->flags & GD_FLG_SKIP_RELOC)
+               return 0;
+       if (gd->new_bootstage) {
+               int size = bootstage_get_size();
+
+               debug("Copying bootstage from %p to %p, size %x\n",
+                     gd->bootstage, gd->new_bootstage, size);
+               memcpy(gd->new_bootstage, gd->bootstage, size);
+               gd->bootstage = gd->new_bootstage;
+       }
+#endif
+
+       return 0;
+}
+
 static int setup_reloc(void)
 {
        if (gd->flags & GD_FLG_SKIP_RELOC) {
@@ -828,6 +860,7 @@ static const init_fnc_t init_sequence_f[] = {
        setup_machine,
        reserve_global_data,
        reserve_fdt,
+       reserve_bootstage,
        reserve_arch,
        reserve_stacks,
        dram_init_banksize,
@@ -849,6 +882,7 @@ static const init_fnc_t init_sequence_f[] = {
 #endif
        INIT_FUNC_WATCHDOG_RESET
        reloc_fdt,
+       reloc_bootstage,
        setup_reloc,
 #if defined(CONFIG_X86) || defined(CONFIG_ARC)
        copy_uboot_to_ram,

diff --git a/common/bootstage.c b/common/bootstage.c
index 32f4e8b7060d12b7b5916a8ef331d5350b7f3faf..a6705af11154fcd6d54f5e3f95bd62e185b5b0fe 100644 (file)
--- a/common/bootstage.c
+++ b/common/bootstage.c
@@ -484,6 +484,11 @@ int bootstage_unstash(void *base, int size)
        return 0;
 }
 
+int bootstage_get_size(void)
+{
+       return sizeof(struct bootstage_data);
+}
+
 int bootstage_init(bool first)
 {
        struct bootstage_data *data;

diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
index 8b3229e5b8d5abce26a242c191374b5c8334a2c3..fb90be9d3ebac66d42ebdfb62eaa97b69d193b20 100644 (file)
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -112,6 +112,7 @@ typedef struct global_data {
 #endif
 #ifdef CONFIG_BOOTSTAGE
        struct bootstage_data *bootstage;       /* Bootstage information */
+       struct bootstage_data *new_bootstage;   /* Relocated bootstage info */
 #endif
 } gd_t;
 #endif

diff --git a/include/bootstage.h b/include/bootstage.h
index 41bd61785c6feb2c00d9fea538b84a0dcfea9b6b..8607e887d8b1e0ebcf858625668b89b53f5752fb 100644 (file)
--- a/include/bootstage.h
+++ b/include/bootstage.h
@@ -331,6 +331,13 @@ int bootstage_stash(void *base, int size);
  */
 int bootstage_unstash(void *base, int size);
 
+/**
+ * bootstage_get_size() - Get the size of the bootstage data
+ *
+ * @return size of boostage data in bytes
+ */
+int bootstage_get_size(void);
+
 /**
  * bootstage_init() - Prepare bootstage for use
  *
@@ -400,6 +407,11 @@ static inline int bootstage_unstash(void *base, int size)
        return 0;       /* Pretend to succeed */
 }
 
+static inline int bootstage_get_size(void)
+{
+       return 0;
+}
+
 static inline int bootstage_init(bool first)
 {
        return 0;