ARM: Migrate errata to Kconfig

[u-boot] / arch / arm / cpu / armv8 / cpu.c

diff --git a/arch/arm/cpu/armv8/cpu.c b/arch/arm/cpu/armv8/cpu.c
index e06c3cc04de47cae7374ca725d33120933cfbbd4..28a27f724e60c2549c629aad0aa45083051e3217 100644 (file)
--- a/arch/arm/cpu/armv8/cpu.c
+++ b/arch/arm/cpu/armv8/cpu.c
@@ -14,8 +14,23 @@
 #include <common.h>
 #include <command.h>
 #include <asm/system.h>
+#include <asm/secure.h>
 #include <linux/compiler.h>
 
+/*
+ * sdelay() - simple spin loop.
+ *
+ * Will delay execution by roughly (@loops * 2) cycles.
+ * This is necessary to be used before timers are accessible.
+ *
+ * A value of "0" will results in 2^64 loops.
+ */
+void sdelay(unsigned long loops)
+{
+       __asm__ volatile ("1:\n" "subs %0, %0, #1\n"
+                         "b.ne 1b" : "=r" (loops) : "0"(loops) : "cc");
+}
+
 int cleanup_before_linux(void)
 {
        /*
@@ -41,3 +56,24 @@ int cleanup_before_linux(void)
 
        return 0;
 }
+
+#ifdef CONFIG_ARMV8_PSCI
+static void relocate_secure_section(void)
+{
+#ifdef CONFIG_ARMV8_SECURE_BASE
+       size_t sz = __secure_end - __secure_start;
+
+       memcpy((void *)CONFIG_ARMV8_SECURE_BASE, __secure_start, sz);
+       flush_dcache_range(CONFIG_ARMV8_SECURE_BASE,
+                          CONFIG_ARMV8_SECURE_BASE + sz + 1);
+       invalidate_icache_all();
+#endif
+}
+
+void armv8_setup_psci(void)
+{
+       relocate_secure_section();
+       secure_ram_addr(psci_setup_vectors)();
+       secure_ram_addr(psci_arch_init)();
+}
+#endif