MIPS: Relocatable: Provide plat_post_relocation hook

This hook provides the platform the chance to perform any required
setup before the boot processor switches to the relocated kernel.
The relocated kernel has been copied and fixed up ready for execution
at this point. Secondary CPUs may wish to switch to it early. There
is also the opportunity for the platform to abort jumping to the
relocated kernel if there is anything wrong with the chosen offset.

Signed-off-by: Matt Redfearn <matt.redfearn@imgtec.com>
Signed-off-by: Steven J. Hill <Steven.Hill@cavium.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/14651/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/kernel/relocate.c b/arch/mips/kernel/relocate.c
index 1958910b75c07aa18926df5d50f93987dbe58406..c82288569eb1de420cf037e7825e40b9c997713a 100644 (file)
--- a/arch/mips/kernel/relocate.c
+++ b/arch/mips/kernel/relocate.c
@@ -31,6 +31,17 @@ extern u32 _relocation_end[];        /* End relocation table */
 extern long __start___ex_table;        /* Start exception table */
 extern long __stop___ex_table; /* End exception table */
 
+/*
+ * This function may be defined for a platform to perform any post-relocation
+ * fixup necessary.
+ * Return non-zero to abort relocation
+ */
+int __weak plat_post_relocation(long offset)
+{
+       return 0;
+}
+
+
 static inline u32 __init get_synci_step(void)
 {
        u32 res;
@@ -338,6 +349,15 @@ void *__init relocate_kernel(void)
                 */
                memcpy(RELOCATED(&__bss_start), &__bss_start, bss_length);
 
+               /*
+                * Last chance for the platform to abort relocation.
+                * This may also be used by the platform to perform any
+                * initialisation required now that the new kernel is
+                * resident in memory and ready to be executed.
+                */
+               if (plat_post_relocation(offset))
+                       goto out;
+
                /* The current thread is now within the relocated image */
                __current_thread_info = RELOCATED(&init_thread_union);