SPDX: Convert all of our single license tags to Linux Kernel style

[u-boot] / board / synopsys / axs10x / axs10x.c

diff --git a/board/synopsys/axs10x/axs10x.c b/board/synopsys/axs10x/axs10x.c
index a5e774b2cf7b26e8d12b801e3e545b6e94666991..af78127dde93131a9bde02bb104b7a3fc613250f 100644 (file)
--- a/board/synopsys/axs10x/axs10x.c
+++ b/board/synopsys/axs10x/axs10x.c
@@ -1,12 +1,12 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <dwmmc.h>
 #include <malloc.h>
+#include <asm/arcregs.h>
 #include "axs10x.h"
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -46,6 +46,18 @@ int board_early_init_f(void)
 }
 
 #ifdef CONFIG_ISA_ARCV2
+
+void board_jump_and_run(ulong entry, int zero, int arch, uint params)
+{
+       void (*kernel_entry)(int zero, int arch, uint params);
+
+       kernel_entry = (void (*)(int, int, uint))entry;
+
+       smp_set_core_boot_addr(entry, -1);
+       smp_kick_all_cpus();
+       kernel_entry(zero, arch, params);
+}
+
 #define RESET_VECTOR_ADDR      0x0
 
 void smp_set_core_boot_addr(unsigned long addr, int corenr)
@@ -61,16 +73,32 @@ void smp_kick_all_cpus(void)
 {
 /* CPU start CREG */
 #define AXC003_CREG_CPU_START  0xF0001400
-
 /* Bits positions in CPU start CREG */
 #define BITS_START     0
-#define BITS_POLARITY  8
+#define BITS_START_MODE        4
 #define BITS_CORE_SEL  9
-#define BITS_MULTICORE 12
 
-#define CMD    (1 << BITS_MULTICORE) | (1 << BITS_CORE_SEL) | \
-               (1 << BITS_POLARITY) | (1 << BITS_START)
+/*
+ * In axs103 v1.1 START bits semantics has changed quite a bit.
+ * We used to have a generic START bit for all cores selected by CORE_SEL mask.
+ * But now we don't touch CORE_SEL at all because we have a dedicated START bit
+ * for each core:
+ *     bit 0: Core 0 (master)
+ *     bit 1: Core 1 (slave)
+ */
+#define BITS_START_CORE1       1
+
+#define ARCVER_HS38_3_0        0x53
+
+       int core_family = read_aux_reg(ARC_AUX_IDENTITY) & 0xff;
+       int cmd = readl((void __iomem *)AXC003_CREG_CPU_START);
 
-       writel(CMD, (void __iomem *)AXC003_CREG_CPU_START);
+       if (core_family < ARCVER_HS38_3_0) {
+               cmd |= (1 << BITS_CORE_SEL) | (1 << BITS_START);
+               cmd &= ~(1 << BITS_START_MODE);
+       } else {
+               cmd |= (1 << BITS_START_CORE1);
+       }
+       writel(cmd, (void __iomem *)AXC003_CREG_CPU_START);
 }
 #endif