Skip to contentSkip to conversation

Add support for booting multiple cores

PATCH Superseded Akshay Saraswat 4 participants 16 messages Feb 20, 2015 – Feb 28, 2015

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v4 cover Add support for booting multiple cores

This patch series introduces changes for booting secondary CPUs on Exynos5420 and Exynos5800.

Changes since v3:
- Patch 2 & 3 : Added errata number in comments.
- Patch 2 & 3 : Moved changes to ARM generic file.
- Patch 6 : Removed this patch. Not required anymore.

Changes since v2:
- Patch 7 & 8 : Replaced #ifdef and #ifndef -> if(proid_is_soc()).
- Patch 11 : Removed #ifdef from enum definition.

Changes since v1:
- Added Reviewed-by & Tested-by in the acked patches.
- Removed unnecessary CONFIGS and macros.
- Changed names of few macros for better understanding in patch 2.
- Added MPIDR bit assignment info comment in power_down_core in patch 2.
- Changed to SPDX header in sec_boot.S in patch 5.
- Fixed compilation error for snow build in patch 11.

Akshay Saraswat (9):
Exynos542x: Config: Add various configs
Exynos542x: CPU: Power down all secondary cores
Exynos542x: Add workaround for ARM errata 798870
Exynos542x: Add workaround for ARM errata 799270
Exynos542x: Add workaround for exynos iROM errata
Exynos542x: cache: Disable clean/evict push to external
Exynos542x: add L2 control register configuration
Exynos542x: Fix secondary core booting for thumb
Exynos542x: Make A7s boot with thumb-mode U-Boot on warm reset

Doug Anderson (1):
Exynos: Fix L2 cache timings on Exynos5420 and Exynos5800

 arch/arm/cpu/armv7/exynos/Makefile        |   2 +
 arch/arm/cpu/armv7/exynos/common_setup.h  |  62 +++++++++++++
 arch/arm/cpu/armv7/exynos/exynos5_setup.h |   3 +
 arch/arm/cpu/armv7/exynos/lowlevel_init.c | 147 ++++++++++++++++++++++++++++++
 arch/arm/cpu/armv7/exynos/sec_boot.S      | 128 ++++++++++++++++++++++++++
 arch/arm/cpu/armv7/exynos/soc.c           |  35 -------
 arch/arm/include/asm/arch-exynos/cpu.h    |   5 +
 arch/arm/include/asm/arch-exynos/system.h |  88 ++++++++++++++++++
 arch/arm/include/asm/armv7.h              |  44 +++++++++
 include/configs/exynos5420-common.h       |  16 ++++
 10 files changed, 495 insertions(+), 35 deletions(-)
 create mode 100644 arch/arm/cpu/armv7/exynos/sec_boot.S
Signature · 1 line
1.9.1
#1 lore raw

PATCH v4 1/10 Exynos542x: Config: Add various configs

This patch adds "iRAM, CPU state and low power" configs which are the addresses acting as flag registers.

iROM code checks CONFIG_LOWPOWER_FLAG address. If it is equal to CONFIG_LOWPOWER_EN then it jumps to the address (0x02020000+CPUID*4). This is a part of iROM logic. Rest other flags are being used at various places during kernel switching and reset.
They are nowhere documented because they are part programming. These configs are serving as flags for us because they are representing the addresses in iRAM which we are using for storing and extracting CPU Status and GIC status.

---
Changes since v3:
- No change.

Changes since v2:
- No change.

Changes since v1:
- Added Reviewed-by & Tested-by.
- Removed unnecessary CONFIGS.

 include/configs/exynos5420-common.h | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
include/configs/exynos5420-common.h +16 -0
index fe72bd0..b42dab7 100644
@@ -38,4 +38,20 @@
 
 #define CONFIG_BOARD_REV_GPIO_COUNT	2
 
+#define CONFIG_PHY_IRAM_BASE		0x02020000
+
+/* Address for relocating helper code (Last 4 KB of IRAM) */
+#define CONFIG_EXYNOS_RELOCATE_CODE_BASE	(CONFIG_IRAM_TOP - 0x1000)
+
+/*
+ * Low Power settings
+ */
+#define CONFIG_LOWPOWER_FLAG		0x02020028
+#define CONFIG_LOWPOWER_ADDR		0x0202002C
+
+/*
+ * Number of CPUs available
+ */
+#define CONFIG_CORE_COUNT		0x8
+
 #endif	/* __CONFIG_EXYNOS5420_H */
Signature · 1 line
1.9.1
#2 lore raw

PATCH v4 2/10 Exynos542x: CPU: Power down all secondary cores

In reply to Akshay Saraswat

This patch adds code to shutdown secondary cores. When U-boot comes up, all secondary cores appear powered on, which is undesirable and causes side effects while initializing these cores in kernel.

Secondary core power down happens in following steps:

Step-1: After Exynos power-on, primary core starts executing first.
Step-2: In iROM code every core has to check 2 flags i.e.

	addresses 0x02020028 & 0x02020004.

Step-3: Initially 0x02020028 is 0 for all cores and 0x02020004 has a
jump address for primary core and 0 for all secondary cores.
Step-4: Therefore, primary core follows normal iROM execution and jumps
to BL1 eventually, whereas all secondary cores enter WFE.
Step-5: When primary core comes into function secondary_cores_configure,
it puts pointer to function power_down_core into 0x02020004 and provides DSB and SEV for all cores so that they may come out of WFE and jump to power_down_core function.
Step-6: And ultimately because of power_down_core all
secondary cores shut-down.

---
Changes since v3:
- No change.

Changes since v2:
- No change.

Changes since v1:
- Removed unnecessary macros.
- Changed names of few macros for better understanding.
- Added MPIDR bit assignment info comment in power_down_core.

 arch/arm/cpu/armv7/exynos/exynos5_setup.h |  3 ++
 arch/arm/cpu/armv7/exynos/lowlevel_init.c | 69 ++++++++++++++++++++++++
 arch/arm/include/asm/arch-exynos/cpu.h    |  5 ++
 arch/arm/include/asm/arch-exynos/system.h | 87 +++++++++++++++++++++++++++++++
 4 files changed, 164 insertions(+)
arch/arm/cpu/armv7/exynos/exynos5_setup.h +3 -0
index 2eea48a..9073f50 100644
@@ -700,6 +700,9 @@
 #define CLK_DIV_CPERI1_VAL	NOT_AVAILABLE
 
 #else
+
+#define CPU_CONFIG_STATUS_OFFSET	0x80
+#define CPU_RST_FLAG_VAL		0xFCBA0D10
 #define PAD_RETENTION_DRAM_COREBLK_VAL	0x10000000
 
 /* APLL_CON1 */
arch/arm/cpu/armv7/exynos/lowlevel_init.c +69 -0

88 lines not on this page · raw message

arch/arm/include/asm/arch-exynos/cpu.h +5 -0
index 29674ad..e739520 100644
@@ -153,6 +153,10 @@
 #define EXYNOS5420_CLOCK_BASE		0x10010000
 #define EXYNOS5420_POWER_BASE		0x10040000
 #define EXYNOS5420_SWRESET		0x10040400
+#define EXYNOS5420_INFORM_BASE		0x10040800
+#define EXYNOS5420_SPARE_BASE		0x10040900
+#define EXYNOS5420_CPU_CONFIG_BASE	0x10042000
+#define EXYNOS5420_CPU_STATUS_BASE	0x10042004
 #define EXYNOS5420_SYSREG_BASE		0x10050000
 #define EXYNOS5420_TZPC_BASE		0x100E0000
 #define EXYNOS5420_WATCHDOG_BASE	0x101D0000
@@ -186,6 +190,7 @@
 #define EXYNOS5420_USB3PHY_BASE		DEVICE_NOT_AVAILABLE
 #define EXYNOS5420_USB_HOST_XHCI_BASE	DEVICE_NOT_AVAILABLE
 
+
 #ifndef __ASSEMBLY__
 #include <asm/io.h>
 /* CPU detection macros */
arch/arm/include/asm/arch-exynos/system.h +87 -0

93 lines not on this page · raw message

Signature · 1 line
1.9.1
#3 lore raw

PATCH v4 3/10 Exynos542x: Add workaround for ARM errata 798870

In reply to Akshay Saraswat

This patch adds workaround for ARM errata 798870 which says "If back-to-back speculative cache line fills (fill A and fill B) are issued from the L1 data cache of a CPU to the L2 cache, the second request (fill B) is then cancelled, and the second request would have detected a hazard against a recent write or eviction (write B) to the same cache line as fill B then the L2 logic might deadlock."

---
Changes since v3:
- Added errata number in comment.
- Moved changes to arm generic armv7.h

Changes since v2:
- No change.

Changes since v1:
- Added Reviewed-by & Tested-by.
- Added space before */ on line # 40.

 arch/arm/include/asm/armv7.h | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
arch/arm/include/asm/armv7.h +16 -0
index a13da23..a2040b7 100644
@@ -69,6 +69,22 @@
 #define CP15DSB	asm volatile ("mcr     p15, 0, %0, c7, c10, 4" : : "r" (0))
 #define CP15DMB	asm volatile ("mcr     p15, 0, %0, c7, c10, 5" : : "r" (0))
 
+/*
+ * Workaround for ARM errata # 798870
+ * Set L2ACTLR[7] to reissue any memory transaction in the L2 that has been
+ * stalled for 1024 cycles to verify that its hazard condition still exists.
+ */
+static inline void v7_enable_l2_hazard_detect(void)
+{
+	uint32_t val;
+
+	/* L2ACTLR[7]: Enable hazard detect timeout */
+	asm volatile ("mrc     p15, 1, %0, c15, c0, 0\n\t" : "=r"(val));
+	val |= (1 << 7);
+	asm volatile ("mcr     p15, 1, %0, c15, c0, 0\n\t" : : "r"(val));
+}
+
+void v7_en_l2_hazard_detect(void);
 void v7_outer_cache_enable(void);
 void v7_outer_cache_disable(void);
 void v7_outer_cache_flush_all(void);
Signature · 1 line
1.9.1
#4 lore raw

PATCH v4 3/10 Exynos542x: Add workaround for ARM errata 798870

Quoted 37 lines · Akshay Saraswat

This patch adds workaround for ARM errata 798870 which says "If back-to-back speculative cache line fills (fill A and fill B) are issued from the L1 data cache of a CPU to the L2 cache, the second request (fill B) is then cancelled, and the second request would have detected a hazard against a recent write or eviction (write B) to the same cache line as fill B then the L2 logic might deadlock."

---
Changes since v3:
- Added errata number in comment.
- Moved changes to arm generic armv7.h

Changes since v2:
- No change.

Changes since v1:
- Added Reviewed-by & Tested-by.
- Added space before */ on line # 40.

 arch/arm/include/asm/armv7.h | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
arch/arm/include/asm/armv7.h +3 -0
index a13da23..a2040b7 100644
@@ -69,6 +69,22 @@
 #define CP15DSB	asm volatile ("mcr     p15, 0, %0, c7, c10, 4" : : "r" (0))
 #define CP15DMB	asm volatile ("mcr     p15, 0, %0, c7, c10, 5" : : "r" (0))
 
+/*
+ * Workaround for ARM errata # 798870
+ * Set L2ACTLR[7] to reissue any memory transaction in the L2 that has been

arch/arm/include/asm/armv7.h line 84

Quoted 10 lines
arch/arm/include/asm/armv7.h +10 -0
+ * stalled for 1024 cycles to verify that its hazard condition still exists.
+ */
+static inline void v7_enable_l2_hazard_detect(void)
+{
+	uint32_t val;
+
+	/* L2ACTLR[7]: Enable hazard detect timeout */
+	asm volatile ("mrc     p15, 1, %0, c15, c0, 0\n\t" : "=r"(val));
+	val |= (1 << 7);
+	asm volatile ("mcr     p15, 1, %0, c15, c0, 0\n\t" : : "r"(val));

This wont work for us in DRA7/OMAP5 L2ACTLR cannot be modified by u-boot. has to go to secure world using smc call.

arch/arm/include/asm/armv7.h line 90

Quoted 6 lines
arch/arm/include/asm/armv7.h +3 -0
+}
+
+void v7_en_l2_hazard_detect(void);
 void v7_outer_cache_enable(void);
 void v7_outer_cache_disable(void);
 void v7_outer_cache_flush_all(void);

How about this - using the series:
https://patchwork.ozlabs.org/patch/443261/
https://patchwork.ozlabs.org/patch/443264/
https://patchwork.ozlabs.org/patch/443268/
https://patchwork.ozlabs.org/patch/443265/
https://patchwork.ozlabs.org/patch/443263/
https://patchwork.ozlabs.org/patch/443262/
https://patchwork.ozlabs.org/patch/443267/
https://patchwork.ozlabs.org/patch/443266/
https://patchwork.ozlabs.org/patch/443260/

Signature · 2 lines
Regards,
Nishanth Menon
#5 lore raw

PATCH v4 3/10 Exynos542x: Add workaround for ARM errata 798870

Quoted 61 lines · Nishanth Menon
Quoted 37 lines · Akshay Saraswat

This patch adds workaround for ARM errata 798870 which says "If back-to-back speculative cache line fills (fill A and fill B) are issued from the L1 data cache of a CPU to the L2 cache, the second request (fill B) is then cancelled, and the second request would have detected a hazard against a recent write or eviction (write B) to the same cache line as fill B then the L2 logic might deadlock."

---
Changes since v3:
- Added errata number in comment.
- Moved changes to arm generic armv7.h

Changes since v2:
- No change.

Changes since v1:
- Added Reviewed-by & Tested-by.
- Added space before */ on line # 40.

 arch/arm/include/asm/armv7.h | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
arch/arm/include/asm/armv7.h +3 -0
index a13da23..a2040b7 100644
@@ -69,6 +69,22 @@
 #define CP15DSB	asm volatile ("mcr     p15, 0, %0, c7, c10, 4" : : "r" (0))
 #define CP15DMB	asm volatile ("mcr     p15, 0, %0, c7, c10, 5" : : "r" (0))
 
+/*
+ * Workaround for ARM errata # 798870
+ * Set L2ACTLR[7] to reissue any memory transaction in the L2 that has been

arch/arm/include/asm/armv7.h line 84

Quoted 10 lines
arch/arm/include/asm/armv7.h +10 -0
+ * stalled for 1024 cycles to verify that its hazard condition still exists.
+ */
+static inline void v7_enable_l2_hazard_detect(void)
+{
+	uint32_t val;
+
+	/* L2ACTLR[7]: Enable hazard detect timeout */
+	asm volatile ("mrc     p15, 1, %0, c15, c0, 0\n\t" : "=r"(val));
+	val |= (1 << 7);
+	asm volatile ("mcr     p15, 1, %0, c15, c0, 0\n\t" : : "r"(val));

This wont work for us in DRA7/OMAP5 L2ACTLR cannot be modified by u-boot. has to go to secure world using smc call.

arch/arm/include/asm/armv7.h line 90

Quoted 6 lines
arch/arm/include/asm/armv7.h +3 -0
+}
+
+void v7_en_l2_hazard_detect(void);
 void v7_outer_cache_enable(void);
 void v7_outer_cache_disable(void);
 void v7_outer_cache_flush_all(void);

How about this - using the series:
https://patchwork.ozlabs.org/patch/443261/

Quoted 8 lines

https://patchwork.ozlabs.org/patch/443264/
https://patchwork.ozlabs.org/patch/443268/
https://patchwork.ozlabs.org/patch/443265/
https://patchwork.ozlabs.org/patch/443263/
https://patchwork.ozlabs.org/patch/443262/
https://patchwork.ozlabs.org/patch/443267/
https://patchwork.ozlabs.org/patch/443266/
https://patchwork.ozlabs.org/patch/443260/

I think the following might work for exynos?

arch/arm/cpu/armv7/exynos/lowlevel_init.c +17 -0
index 83e1dcfc1e13..0157105524ca 100644
@@ -42,6 +42,23 @@ enum {
 	DO_POWER	= 1 << 4,
 };
 
+#ifdef CONFIG_ARM_ARCH_CP15_ERRATA
+void arch_cp15_errata_workaround(u32 midr, u32 variant, u32 rev, u32 comb)
+{
+#ifdef CONFIG_ARM_ERRATA_798870
+	if (comb >= 0x20 && comb < 0x30) {
+		uint32_t l2actlr;
+
+		mrc_l2_aux_ctlr(l2actlr);
+		/* Disable ACE DVM/CMO message broadcas */
+		l2actlr |= (1 << 7);
+		mcr_l2_aux_ctlr(l2actlr);
+		mrc_l2_ctlr(l2actlr);
+	}
+#endif
+}
+#endif
+
 int do_lowlevel_init(void)
 {
 	uint32_t reset_status;
Signature · 2 lines
Regards,
Nishanth Menon
#6 lore raw

PATCH v4 3/10 Exynos542x: Add workaround for ARM errata 798870

In reply to Nishanth Menon
Quoted 35 lines · Nishanth Menon
Quoted 34 lines · Akshay Saraswat

This patch adds workaround for ARM errata 798870 which says "If back-to-back speculative cache line fills (fill A and fill B) are issued from the L1 data cache of a CPU to the L2 cache, the second request (fill B) is then cancelled, and the second request would have detected a hazard against a recent write or eviction (write B) to the same cache line as fill B then the L2 logic might deadlock."

---
Changes since v3:
- Added errata number in comment.
- Moved changes to arm generic armv7.h

Changes since v2:
- No change.

Changes since v1:
- Added Reviewed-by & Tested-by.
- Added space before */ on line # 40.

 arch/arm/include/asm/armv7.h | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
arch/arm/include/asm/armv7.h +0 -0
index a13da23..a2040b7 100644
@@ -69,6 +69,22 @@
 #define CP15DSB	asm volatile ("mcr     p15, 0, %0, c7, c10, 4" : : "r" (0))
 #define CP15DMB	asm volatile ("mcr     p15, 0, %0, c7, c10, 5" : : "r" (0))
 
Quoted 17 lines

arch/arm/include/asm/armv7.h line 84

Quoted 13 lines
arch/arm/include/asm/armv7.h +13 -0
+/*
+ * Workaround for ARM errata # 798870
+ * Set L2ACTLR[7] to reissue any memory transaction in the L2 that has been
+ * stalled for 1024 cycles to verify that its hazard condition still exists.
+ */
+static inline void v7_enable_l2_hazard_detect(void)
+{
+	uint32_t val;
+
+	/* L2ACTLR[7]: Enable hazard detect timeout */
+	asm volatile ("mrc     p15, 1, %0, c15, c0, 0\n\t" : "=r"(val));
+	val |= (1 << 7);
+	asm volatile ("mcr     p15, 1, %0, c15, c0, 0\n\t" : : "r"(val));

This wont work for us in DRA7/OMAP5 L2ACTLR cannot be modified by u-boot. has to go to secure world using smc call.

I believe the same may be true even on some exynos5 platforms with secure firmware (e.g. exynos5422-odroid-xu3).

Kevin

#7 lore raw

PATCH v4 3/10 Exynos542x: Add workaround for ARM errata 798870

Quoted 55 lines · Kevin Hilman
Quoted 35 lines · Nishanth Menon
Quoted 34 lines · Akshay Saraswat

This patch adds workaround for ARM errata 798870 which says "If back-to-back speculative cache line fills (fill A and fill B) are issued from the L1 data cache of a CPU to the L2 cache, the second request (fill B) is then cancelled, and the second request would have detected a hazard against a recent write or eviction (write B) to the same cache line as fill B then the L2 logic might deadlock."

---
Changes since v3:
- Added errata number in comment.
- Moved changes to arm generic armv7.h

Changes since v2:
- No change.

Changes since v1:
- Added Reviewed-by & Tested-by.
- Added space before */ on line # 40.

 arch/arm/include/asm/armv7.h | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
arch/arm/include/asm/armv7.h +0 -0
index a13da23..a2040b7 100644
@@ -69,6 +69,22 @@
 #define CP15DSB	asm volatile ("mcr     p15, 0, %0, c7, c10, 4" : : "r" (0))
 #define CP15DMB	asm volatile ("mcr     p15, 0, %0, c7, c10, 5" : : "r" (0))
 
Quoted 17 lines

arch/arm/include/asm/armv7.h line 84

Quoted 13 lines
arch/arm/include/asm/armv7.h +13 -0
+/*
+ * Workaround for ARM errata # 798870
+ * Set L2ACTLR[7] to reissue any memory transaction in the L2 that has been
+ * stalled for 1024 cycles to verify that its hazard condition still exists.
+ */
+static inline void v7_enable_l2_hazard_detect(void)
+{
+	uint32_t val;
+
+	/* L2ACTLR[7]: Enable hazard detect timeout */
+	asm volatile ("mrc     p15, 1, %0, c15, c0, 0\n\t" : "=r"(val));
+	val |= (1 << 7);
+	asm volatile ("mcr     p15, 1, %0, c15, c0, 0\n\t" : : "r"(val));

This wont work for us in DRA7/OMAP5 L2ACTLR cannot be modified by u-boot. has to go to secure world using smc call.

Quoted 2 lines

I believe the same may be true even on some exynos5 platforms with secure firmware (e.g. exynos5422-odroid-xu3).

I hope http://comments.gmane.org/gmane.comp.boot-loaders.u-boot/213207
should probably help handle for secure and non-secure devices by some soc specific glue layer (something similar to omap3 perhaps).. I am not too familiar with exynos family to comment better.

Signature · 2 lines
Regards,
Nishanth Menon
#8 lore raw

PATCH v4 4/10 Exynos542x: Add workaround for ARM errata 799270

In reply to Akshay Saraswat

This patch adds workaround for the ARM errata 799270 which says "If the L2 cache logic clock is stopped because of L2 inactivity, setting or clearing the ACTLR.SMP bit might not be effective. The bit is modified in the ACTLR, meaning a read of the register returns the updated value. However the logic that uses that bit retains the previous value."

---
Changes since v3:
- Added errata number in comment.
- Moved changes to arm generic armv7.h

Changes since v2:
- No change.

Changes since v1:
- Added Reviewed-by & Tested-by.

 arch/arm/include/asm/armv7.h | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
arch/arm/include/asm/armv7.h +28 -0
index a2040b7..dc9561c 100644
@@ -84,6 +84,34 @@ static inline void v7_enable_l2_hazard_detect(void)
 	asm volatile ("mcr     p15, 1, %0, c15, c0, 0\n\t" : : "r"(val));
 }
 
+/*
+ * Workaround for ARM errata # 799270
+ * Ensure that the L2 logic has been used within the previous 256 cycles
+ * before modifying the ACTLR.SMP bit. This is required during boot before
+ * MMU has been enabled, or during a specified reset or power down sequence.
+ */
+static inline void v7_enable_smp(uint32_t address)
+{
+	uint32_t temp, val;
+
+	/* Read auxiliary control register */
+	asm volatile ("mrc     p15, 0, %0, c1, c0, 1\n\t" : "=r"(val));
+
+	/* Enable SMP */
+	val |= (1 << 6);
+
+	/* Dummy read to assure L2 access */
+	temp = readl(address);
+	temp &= 0;
+	val |= temp;
+
+	/* Write auxiliary control register */
+	asm volatile ("mcr     p15, 0, %0, c1, c0, 1\n\t" : : "r"(val));
+
+	CP15DSB;
+	CP15ISB;
+}
+
 void v7_en_l2_hazard_detect(void);
 void v7_outer_cache_enable(void);
 void v7_outer_cache_disable(void);
Signature · 1 line
1.9.1
#9 lore raw

PATCH v4 5/10 Exynos542x: Add workaround for exynos iROM errata

In reply to Akshay Saraswat

iROM logic provides undesired jump address for CPU2. This patch adds a programmable susbstitute for a part of iROM logic which wakes up cores and provides jump addresses. This patch creates a logic to make all secondary cores jump to a particular address which evades the possibility of CPU2 jumping to wrong address and create undesired results.

Logic of the workaround:

Step-1: iROM code checks value at address 0x2020028.
Step-2: If value is 0xc9cfcfcf, it jumps to the address (0x202000+CPUid*4),
else, it continues executing normally.
Step-3: Primary core puts secondary cores in WFE and store 0xc9cfcfcf in

	0x2020028 and jump address (pointer to function low_power_start)
	in (0x202000+CPUid*4).

Step-4: When secondary cores recieve event signal they jump to this address
and continue execution.

---
Changes since v3:
- Included armv7.h in lowlevel_init.c.

Changes since v2:
- No change.

Changes since v1:
- Added Reviewed-by & Tested-by.
- Changed to SPDX header in sec_boot.S.

 arch/arm/cpu/armv7/exynos/Makefile        |   2 +
 arch/arm/cpu/armv7/exynos/lowlevel_init.c |  86 ++++++++++++++++----
 arch/arm/cpu/armv7/exynos/sec_boot.S      | 128 ++++++++++++++++++++++++++++++
 3 files changed, 200 insertions(+), 16 deletions(-)
 create mode 100644 arch/arm/cpu/armv7/exynos/sec_boot.S
arch/arm/cpu/armv7/exynos/Makefile +2 -0
index e207bd6..8542f89 100644
@@ -7,6 +7,8 @@
 
 obj-y	+= clock.o power.o soc.o system.o pinmux.o tzpc.o
 
+obj-$(CONFIG_EXYNOS5420)	+= sec_boot.o
+
 ifdef CONFIG_SPL_BUILD
 obj-$(CONFIG_EXYNOS5)	+= clock_init_exynos5.o
 obj-$(CONFIG_EXYNOS5)	+= dmc_common.o dmc_init_ddr3.o
arch/arm/cpu/armv7/exynos/lowlevel_init.c +70 -16

117 lines not on this page · raw message

arch/arm/cpu/armv7/exynos/sec_boot.S new file +128 -0

128 lines not on this page · raw message

Signature · 1 line
1.9.1
#10 lore raw

PATCH v4 6/10 Exynos542x: cache: Disable clean/evict push to external

In reply to Akshay Saraswat

L2 Auxiliary Control Register provides configuration and control options for the L2 memory system. Bit 3 of L2ACTLR stands for clean/evict push to external. Setting bit 3 disables clean/evict which is what this patch intends to do.

---
Changes since v3:
- No change.

Changes since v2:
- Replaced #ifdef with if(proid_id_soc()) check.

Changes since v1:
- Added Reviewed-by & Tested-by.

 arch/arm/cpu/armv7/exynos/soc.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)
arch/arm/cpu/armv7/exynos/soc.c +17 -1
index 8c7d7d8..427f54c 100644
@@ -13,7 +13,9 @@ enum l2_cache_params {
 	CACHE_TAG_RAM_SETUP = (1 << 9),
 	CACHE_DATA_RAM_SETUP = (1 << 5),
 	CACHE_TAG_RAM_LATENCY = (2 << 6),
-	CACHE_DATA_RAM_LATENCY = (2 << 0)
+	CACHE_DATA_RAM_LATENCY = (2 << 0),
+	CACHE_ENABLE_CLEAN_EVICT = (0 << 3),
+	CACHE_DISABLE_CLEAN_EVICT = (1 << 3)
 };
 
 void reset_cpu(ulong addr)
@@ -37,14 +39,28 @@ static void exynos5_set_l2cache_params(void)
 {
 	unsigned int val = 0;
 
+	/* Read L2CTLR value */
 	asm volatile("mrc p15, 1, %0, c9, c0, 2\n" : "=r"(val));
 
+	/* Set cache setup and latency cycles */
 	val |= CACHE_TAG_RAM_SETUP |
 		CACHE_DATA_RAM_SETUP |
 		CACHE_TAG_RAM_LATENCY |
 		CACHE_DATA_RAM_LATENCY;
 
+	/* Write new vlaue to L2CTLR */
 	asm volatile("mcr p15, 1, %0, c9, c0, 2\n" : : "r"(val));
+
+	if (proid_is_exynos5420() || proid_is_exynos5800()) {
+		/* Read L2ACTLR value */
+		asm volatile("mrc	p15, 1, %0, c15, c0, 0" : "=r" (val));
+
+		/* Disable clean/evict push to external */
+		val |= CACHE_DISABLE_CLEAN_EVICT;
+
+		/* Write new vlaue to L2ACTLR */
+		asm volatile("mcr	p15, 1, %0, c15, c0, 0" : : "r" (val));
+	}
 }
 
 /*
Signature · 1 line
1.9.1
#11 lore raw

PATCH v4 7/10 Exynos542x: add L2 control register configuration

In reply to Akshay Saraswat

This patch does 3 things:
1. Enables ECC by setting 21st bit of L2CTLR.
2. Restore data and tag RAM latencies to 3 cycles because iROM sets 0x3000400 L2CTLR value during switching.
3. Disable clean/evict push to external by setting 3rd bit of L2ACTLR. We need to restore this here due to switching.

---
Changes since v3:
- Rebased.

Changes since v2:
- Replaced #ifndef with if(proid_is_soc()) check.

Changes since v1:
- Added Reviewed-by & Tested-by.

 arch/arm/cpu/armv7/exynos/lowlevel_init.c | 51 ++++++++++++++++++++++++++++++-
 arch/arm/cpu/armv7/exynos/soc.c           | 26 ++++++++--------
 2 files changed, 64 insertions(+), 13 deletions(-)
arch/arm/cpu/armv7/exynos/lowlevel_init.c +50 -1
index b94e49f..0504576 100644
@@ -47,6 +47,42 @@ enum {
 
 #ifdef CONFIG_EXYNOS5420
 /*
+ * Enable ECC by setting L2CTLR[21].
+ * Set L2CTLR[7] to make tag ram latency 3 cycles and
+ * set L2CTLR[1] to make data ram latency 3 cycles.
+ * We need to make RAM latency of 3 cycles here because cores
+ * power ON and OFF while switching. And everytime a core powers
+ * ON, iROM provides it a default L2CTLR value 0x400 which stands
+ * for TAG RAM setup of 1 cycle. Hence, we face a need of
+ * restoring data and tag latency values.
+ */
+static void configure_l2_ctlr(void)
+{
+	uint32_t val;
+
+	mrc_l2_ctlr(val);
+	val |= (1 << 21);
+	val |= (1 << 7);
+	val |= (1 << 1);
+	mcr_l2_ctlr(val);
+}
+
+/*
+ * Set L2ACTLR[27] to prevent the clock generator from stopping
+ * the L2 logic clock.
+ * Set L2ACTLR[3] to disable clean/evict push to external.
+ */
+static void configure_l2_actlr(void)
+{
+	uint32_t val;
+
+	mrc_l2_aux_ctlr(val);
+	val |= (1 << 27);
+	val |= (1 << 3);
+	mcr_l2_aux_ctlr(val);
+}
+
+/*
  * Power up secondary CPUs.
  */
 static void secondary_cpu_start(void)
@@ -80,7 +116,19 @@ static void low_power_start(void)
 
 	/* Set the CPU to SVC32 mode */
 	svc32_mode_en();
-	v7_enable_l2_hazard_detect();
+
+#ifndef CONFIG_SYS_L2CACHE_OFF
+	/* Read MIDR for Primary Part Number */
+	mrc_midr(val);
+	val = (val >> 4);
+	val &= 0xf;
+
+	if (val == 0xf) {
+		configure_l2_ctlr();
+		configure_l2_actlr();
+		v7_enable_l2_hazard_detect();
+	}
+#endif
 
 	/* Invalidate L1 & TLB */
 	val = 0x0;
@@ -138,6 +186,7 @@ static void power_down_core(void)
 static void secondary_cores_configure(void)
 {
 	/* Setup L2 cache */
+	configure_l2_ctlr();
 	v7_enable_l2_hazard_detect();
 
 	/* Clear secondary boot iRAM base */
arch/arm/cpu/armv7/exynos/soc.c +14 -12
index 427f54c..68eb8e7 100644
@@ -37,30 +37,32 @@ void enable_caches(void)
  */
 static void exynos5_set_l2cache_params(void)
 {
-	unsigned int val = 0;
+	unsigned int l2ctlr = 0, l2actlr = 0;
 
 	/* Read L2CTLR value */
-	asm volatile("mrc p15, 1, %0, c9, c0, 2\n" : "=r"(val));
+	asm volatile("mrc p15, 1, %0, c9, c0, 2\n" : "=r"(l2ctlr));
 
-	/* Set cache setup and latency cycles */
-	val |= CACHE_TAG_RAM_SETUP |
-		CACHE_DATA_RAM_SETUP |
-		CACHE_TAG_RAM_LATENCY |
+	/* Set cache latency cycles */
+	l2ctlr |= CACHE_TAG_RAM_LATENCY |
 		CACHE_DATA_RAM_LATENCY;
 
-	/* Write new vlaue to L2CTLR */
-	asm volatile("mcr p15, 1, %0, c9, c0, 2\n" : : "r"(val));
-
 	if (proid_is_exynos5420() || proid_is_exynos5800()) {
 		/* Read L2ACTLR value */
-		asm volatile("mrc	p15, 1, %0, c15, c0, 0" : "=r" (val));
+		asm volatile("mrc p15, 1, %0, c15, c0, 0" : "=r" (l2actlr));
 
 		/* Disable clean/evict push to external */
-		val |= CACHE_DISABLE_CLEAN_EVICT;
+		l2actlr |= CACHE_DISABLE_CLEAN_EVICT;
 
 		/* Write new vlaue to L2ACTLR */
-		asm volatile("mcr	p15, 1, %0, c15, c0, 0" : : "r" (val));
+		asm volatile("mcr p15, 1, %0, c15, c0, 0" : : "r" (l2actlr));
+	} else {
+		/* Set cache setup cycles */
+		l2ctlr |= CACHE_TAG_RAM_SETUP |
+			CACHE_DATA_RAM_SETUP;
 	}
+
+	/* Write new vlaue to L2CTLR */
+	asm volatile("mcr p15, 1, %0, c9, c0, 2\n" : : "r"(l2ctlr));
 }
 
 /*
Signature · 1 line
1.9.1
#12 lore raw

PATCH v4 8/10 Exynos542x: Fix secondary core booting for thumb

In reply to Akshay Saraswat

When compiled SPL for Thumb secondary cores failed to boot at the kernel boot up. Only one core came up out of 4. This was happening because the code relocated to the address 0x02073000 by the primary core was an ARM asm code which was executed by the secondary cores as if it was a thumb code.
This patch fixes the issue of secondary cores considering relocated code as Thumb instructions and not ARM instructions by jumping to the relocated with the help of "bx" ARM instruction. "bx" instruction changes the 5th bit of CPSR which allows execution unit to consider the following instructions as ARM instructions.

---
Changes since v3:
- No change.

Changes since v2:
- No change.

Changes since v1:
- Added Reviewed-by & Tested-by.

 arch/arm/cpu/armv7/exynos/lowlevel_init.c | 2 +-
 arch/arm/include/asm/arch-exynos/system.h | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
arch/arm/cpu/armv7/exynos/lowlevel_init.c +1 -1
index 0504576..782ecd1 100644
@@ -89,7 +89,7 @@ static void secondary_cpu_start(void)
 {
 	v7_enable_smp(EXYNOS5420_INFORM_BASE);
 	svc32_mode_en();
-	set_pc(CONFIG_EXYNOS_RELOCATE_CODE_BASE);
+	branch_bx(CONFIG_EXYNOS_RELOCATE_CODE_BASE);
 }
 
 /*
arch/arm/include/asm/arch-exynos/system.h +3 -0
index 86903c3..a9fd5e6 100644
@@ -75,6 +75,9 @@ struct exynos5_sysreg {
 /* Set program counter with the given value */
 #define set_pc(x) __asm__ __volatile__ ("mov     pc, %0\n\t" : : "r"(x))
 
+/* Branch to the given location */
+#define branch_bx(x) __asm__ __volatile__ ("bx	%0\n\t" : : "r"(x))
+
 /* Read Main Id register */
 #define mrc_midr(x) __asm__ __volatile__	\
 			("mrc     p15, 0, %0, c0, c0, 0\n\t" : "=r"(x) : )
Signature · 1 line
1.9.1
#13 lore raw

PATCH v4 9/10 Exynos542x: Make A7s boot with thumb-mode U-Boot on warm reset

In reply to Akshay Saraswat

On warm reset, all cores jump to the low_power_start function because iRAM data is retained and because while executing iROM code all cores find the jump flag 0x02020028 set. In low_power_start, cores check the reset status and if true they clear the jump flag and jump back to 0x0.

The A7 cores do jump to 0x0 but consider following instructions as a Thumb instructions which in turn makes them loop inside the iROM code instead of jumping to power_down_core.

This issue is fixed by replacing the "mov pc" instruction with a "bx" instruction which switches state along with the jump to make the execution unit consider the branch target as an ARM instruction.

---
Changes since v3:
- No change.

Changes since v2:
- No change.

Changes since v1:
- Added Reviewed-by & Tested-by.

 arch/arm/cpu/armv7/exynos/lowlevel_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/cpu/armv7/exynos/lowlevel_init.c +1 -1
index 782ecd1..329ab0c 100644
@@ -103,7 +103,7 @@ static void low_power_start(void)
 	reg_val = readl(EXYNOS5420_SPARE_BASE);
 	if (reg_val != CPU_RST_FLAG_VAL) {
 		writel(0x0, CONFIG_LOWPOWER_FLAG);
-		set_pc(0x0);
+		branch_bx(0x0);
 	}
 
 	reg_val = readl(CONFIG_PHY_IRAM_BASE + 0x4);
Signature · 1 line
1.9.1
#14 lore raw

PATCH v4 10/10 Exynos: Fix L2 cache timings on Exynos5420 and Exynos5800

In reply to Akshay Saraswat

From: Doug Anderson <[email protected]>

It was found that the L2 cache timings that we had before could cause freezes and hangs. We should make things more robust with better timings. Currently the production ChromeOS kernel applies these timings, but it's nice to fixup firmware too (and upstream probably won't take our kernel hacks).

This also provides a big cleanup of the L2 cache init code avoiding some duplication. The way things used to work:
* low_power_start() was installed by the SPL (both at boot and resume time) and left resident in iRAM for the kernel to use when bringing up additional CPUs. It used configure_l2_ctlr() and configure_l2_actlr() when it detected it was on an A15. This was needed (despite the L2 cache registers being shared among all A15s) because we might have been the first man in after the whole A15 cluster was shutdown.
* secondary_cores_configure() was called on at boot time and at resume time. Strangely this called configure_l2_ctlr() but not configure_l2_actlr() which was almost certainly wrong. Given that we'll call both (see next bullet) later in the boot process it didn't matter for normal boot, but I guess this is how L2 cache settings got set on 5420/5800 (but not 5250?) at resume time.
* exynos5_set_l2cache_params() was called as part of cache enablement. This should happen at boot time (normally in the SPL except for USB boot where it happens in main U-Boot).

Note that the old code wasn't setting ECC/parity in the cache enablement code but we happened to get it anyway because we'd call secondary_cores_configure() at boot time. For resume time we'd get it anyway when the 2nd A15 core came up.

Let's make this a whole lot simpler. Now we always set these parameters in the same place for all boots and use the same code for setting up secondary CPUs.

Intended net effects of this change (other than cleanup):
* Timings go from before:

    data: 0 cycle setup, 3 cycles (0x2) latency
    tag:  0 cycle setup, 3 cycles (0x2) latency
  after:
    data: 1 cycle setup, 4 cycles (0x3) latency
    tag:  1 cycle setup, 4 cycles (0x3) latency

* L2ACTLR is properly initted on 5420/5800 in all cases.

One note is that we're still relying on luck to keep low_power_start() working. The compiler is being nice and not storing anything on the stack.

Another note is that on its own this patch won't help to fix cache settings in an RW U-Boot update where we still have the RO SPL. The plan for that is:
* Have RW U-Boot re-init the cache right before calling the kernel (after it has turned the L2 cache off). This is why the functions are in a header file instead of lowlevel_init.c.

* Have the kernel save the L2 cache settings of the boot CPU and apply them to all other CPUs. We get a little lucky here because the old code was using "|=" to modify the registers and all of the bits that it's setting are also present in the new settings (!). That means that when the 2nd CPU in the A15 cluster comes up it doesn't actually mess up the settings of the 1st CPU in the A15 cluster. An alternative option is to have the kernel write its own low_power_start() code.

---
Changes since v3:
- Rebased.

Changes since v2:
- Removed #ifdef from enum definition.

Changes since v1:
- Fixed compilation error for snow build.

 arch/arm/cpu/armv7/exynos/common_setup.h  | 62 +++++++++++++++++++++++++++++++
 arch/arm/cpu/armv7/exynos/lowlevel_init.c | 55 ++++++++-------------------
 arch/arm/cpu/armv7/exynos/soc.c           | 53 --------------------------
 arch/arm/include/asm/arch-exynos/system.h |  2 -
 4 files changed, 77 insertions(+), 95 deletions(-)
arch/arm/cpu/armv7/exynos/common_setup.h +62 -0
index e6318c0..5235abb 100644
@@ -23,6 +23,8 @@
  * MA 02111-1307 USA
  */
 
+#include <asm/arch/system.h>
+
 #define DMC_OFFSET	0x10000
 
 /*
@@ -43,3 +45,63 @@ void system_clock_init(void);
 int do_lowlevel_init(void);
 
 void sdelay(unsigned long);
+
+enum l2_cache_params {
+	CACHE_DATA_RAM_LATENCY_2_CYCLES = (2 << 0),
+	CACHE_DATA_RAM_LATENCY_3_CYCLES = (3 << 0),
+	CACHE_DISABLE_CLEAN_EVICT = (1 << 3),
+	CACHE_DATA_RAM_SETUP = (1 << 5),
+	CACHE_TAG_RAM_LATENCY_2_CYCLES = (2 << 6),
+	CACHE_TAG_RAM_LATENCY_3_CYCLES = (3 << 6),
+	CACHE_ENABLE_HAZARD_DETECT = (1 << 7),
+	CACHE_TAG_RAM_SETUP = (1 << 9),
+	CACHE_ECC_AND_PARITY = (1 << 21),
+	CACHE_ENABLE_FORCE_L2_LOGIC = (1 << 27)
+};
+
+
+#ifndef CONFIG_SYS_L2CACHE_OFF
+/*
+ * Configure L2CTLR to get timings that keep us from hanging/crashing.
+ *
+ * Must be inline here since low_power_start() is called without a
+ * stack (!).
+ */
+static inline void configure_l2_ctlr(void)
+{
+	uint32_t val;
+
+	mrc_l2_ctlr(val);
+
+	val |= CACHE_TAG_RAM_SETUP |
+		CACHE_DATA_RAM_SETUP |
+		CACHE_TAG_RAM_LATENCY_2_CYCLES |
+		CACHE_DATA_RAM_LATENCY_2_CYCLES;
+
+	if (proid_is_exynos5420() || proid_is_exynos5800()) {
+		val |= CACHE_ECC_AND_PARITY |
+			CACHE_TAG_RAM_LATENCY_3_CYCLES |
+			CACHE_DATA_RAM_LATENCY_3_CYCLES;
+	}
+
+	mcr_l2_ctlr(val);
+}
+
+/*
+ * Configure L2ACTLR.
+ *
+ * Must be inline here since low_power_start() is called without a
+ * stack (!).
+ */
+static inline void configure_l2_actlr(void)
+{
+	uint32_t val;
+
+	if (proid_is_exynos5420() || proid_is_exynos5800()) {
+		mrc_l2_aux_ctlr(val);
+		val |= CACHE_ENABLE_FORCE_L2_LOGIC |
+			CACHE_DISABLE_CLEAN_EVICT;
+		mcr_l2_aux_ctlr(val);
+	}
+}
+#endif
arch/arm/cpu/armv7/exynos/lowlevel_init.c +15 -40

73 lines not on this page · raw message

arch/arm/cpu/armv7/exynos/soc.c +0 -53

62 lines not on this page · raw message

arch/arm/include/asm/arch-exynos/system.h +0 -2
index a9fd5e6..3ffb296 100644
@@ -37,7 +37,6 @@ struct exynos5_sysreg {
 
 #define USB20_PHY_CFG_HOST_LINK_EN	(1 << 0)
 
-#ifdef CONFIG_EXYNOS5420
 /*
  * Data Synchronization Barrier acts as a special kind of memory barrier.
  * No instruction in program order after this instruction executes until
@@ -125,7 +124,6 @@ struct exynos5_sysreg {
 /* Write L2 Auxilliary Control register */
 #define mcr_l2_aux_ctlr(x) __asm__ __volatile__	\
 			("mcr     p15, 1, %0, c15, c0, 0\n\t" : : "r"(x))
-#endif
 
 void set_usbhost_mode(unsigned int mode);
 void set_system_display_ctrl(void);
Signature · 1 line
1.9.1
#15 lore raw

v4 cover Add support for booting multiple cores

In reply to Akshay Saraswat
Quoted 34 lines · Akshay Saraswat

This patch series introduces changes for booting secondary CPUs on Exynos5420 and Exynos5800.

Changes since v3:
- Patch 2 & 3 : Added errata number in comments.
- Patch 2 & 3 : Moved changes to ARM generic file.
- Patch 6 : Removed this patch. Not required anymore.

Changes since v2:
- Patch 7 & 8 : Replaced #ifdef and #ifndef -> if(proid_is_soc()).
- Patch 11 : Removed #ifdef from enum definition.

Changes since v1:
- Added Reviewed-by & Tested-by in the acked patches.
- Removed unnecessary CONFIGS and macros.
- Changed names of few macros for better understanding in patch 2.
- Added MPIDR bit assignment info comment in power_down_core in patch 2.
- Changed to SPDX header in sec_boot.S in patch 5.
- Fixed compilation error for snow build in patch 11.

Akshay Saraswat (9):
Exynos542x: Config: Add various configs
Exynos542x: CPU: Power down all secondary cores
Exynos542x: Add workaround for ARM errata 798870
Exynos542x: Add workaround for ARM errata 799270
Exynos542x: Add workaround for exynos iROM errata
Exynos542x: cache: Disable clean/evict push to external
Exynos542x: add L2 control register configuration
Exynos542x: Fix secondary core booting for thumb
Exynos542x: Make A7s boot with thumb-mode U-Boot on warm reset

Doug Anderson (1):
Exynos: Fix L2 cache timings on Exynos5420 and Exynos5800

Quoted 13 lines
 arch/arm/cpu/armv7/exynos/Makefile        |   2 +
 arch/arm/cpu/armv7/exynos/common_setup.h  |  62 +++++++++++++
 arch/arm/cpu/armv7/exynos/exynos5_setup.h |   3 +
 arch/arm/cpu/armv7/exynos/lowlevel_init.c | 147 ++++++++++++++++++++++++++++++
 arch/arm/cpu/armv7/exynos/sec_boot.S      | 128 ++++++++++++++++++++++++++
 arch/arm/cpu/armv7/exynos/soc.c           |  35 -------
 arch/arm/include/asm/arch-exynos/cpu.h    |   5 +
 arch/arm/include/asm/arch-exynos/system.h |  88 ++++++++++++++++++
 arch/arm/include/asm/armv7.h              |  44 +++++++++
 include/configs/exynos5420-common.h       |  16 ++++
 10 files changed, 495 insertions(+), 35 deletions(-)
 create mode 100644 arch/arm/cpu/armv7/exynos/sec_boot.S

applied to u-boot-samsung.

Thanks,
Minkyu Kang.