Skip to contentSkip to conversation

arm: mach-rmobile: Move cpu_reset to rzg2-reset.c

PATCH In review Adam Ford 2 participants 5 messages Aug 27, 2021 – Aug 30, 2021

Subsystems (2)
lore
Share & tools
lore

Adam Ford

author
#0 lore raw

PATCH 1/2 arm: mach-rmobile: Move cpu_reset to rzg2-reset.c

Various RZ/G2[MNH] boards have copies of cpu_reset which creates duplicate code, so move this to a common file shared among all users of the RZG2 and declare it weak so it can be overwritten if necessary.

arch/arm/mach-rmobile/Makefile +1 -1
index 195bbeb5c8..2bd173ec3a 100644
@@ -13,7 +13,7 @@ obj-$(CONFIG_SH73A0) += lowlevel_init.o cpu_info-sh73a0.o pfc-sh73a0.o
 obj-$(CONFIG_R8A7740) += lowlevel_init.o cpu_info-r8a7740.o pfc-r8a7740.o
 obj-$(CONFIG_RCAR_GEN2) += lowlevel_init_ca15.o cpu_info-rcar.o
 obj-$(CONFIG_RCAR_GEN3) += lowlevel_init_gen3.o cpu_info-rcar.o memmap-gen3.o
-obj-$(CONFIG_RZ_G2) += cpu_info-rzg.o
+obj-$(CONFIG_RZ_G2) += cpu_info-rzg.o rzg2-reset.o
 
 ifneq ($(CONFIG_R8A779A0),)
 obj-$(CONFIG_ARMV8_PSCI) += psci-r8a779a0.o
arch/arm/mach-rmobile/rzg2-reset.c new file +26 -0
new file mode 100644
index 0000000000..8c3608f34a
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2021 Renesas Electronics Corporation
+ */
+
+#include <asm/io.h>
+
+#define RST_BASE	0xE6160000
+#define RST_CA57RESCNT	(RST_BASE + 0x40)
+#define RST_CA53RESCNT	(RST_BASE + 0x44)
+#define RST_CA57_CODE	0xA5A5000F
+#define RST_CA53_CODE	0x5A5A000F
+
+__weak void reset_cpu(void)
+{
+	unsigned long midr, cputype;
+
+	asm volatile("mrs %0, midr_el1" : "=r" (midr));
+	cputype = (midr >> 4) & 0xfff;
+
+	if (cputype == 0xd03)
+		writel(RST_CA53_CODE, RST_CA53RESCNT);
+	else
+		writel(RST_CA57_CODE, RST_CA57RESCNT);
+}
+
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 2/2 arm: rmobile: Remove duplicate code from beacon-rzg2m and hihope-rzg2

With reset_cpu() now existing in common code, there is no need to have this exist in each board.

board/beacon/beacon-rzg2m/beacon-rzg2m.c +0 -9
index c12ff77fb2..f5146594b5 100644
@@ -27,12 +27,3 @@ int board_init(void)
 
 	return 0;
 }
-
-#define RST_BASE	0xE6160000
-#define RST_CA57RESCNT	(RST_BASE + 0x40)
-#define RST_CODE	0xA5A5000F
-
-void reset_cpu(void)
-{
-	writel(RST_CODE, RST_CA57RESCNT);
-}
board/hoperun/hihope-rzg2/hihope-rzg2.c +0 -19
index c1db387b27..59e124c829 100644
@@ -16,12 +16,6 @@
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 
-#define RST_BASE	0xE6160000
-#define RST_CA57RESCNT	(RST_BASE + 0x40)
-#define RST_CA53RESCNT	(RST_BASE + 0x44)
-#define RST_CA57_CODE	0xA5A5000F
-#define RST_CA53_CODE	0x5A5A000F
-
 DECLARE_GLOBAL_DATA_PTR;
 #define HSUSB_MSTP704		BIT(4)	/* HSUSB */
 
@@ -65,19 +59,6 @@ int board_init(void)
 	return 0;
 }
 
-void reset_cpu(void)
-{
-	unsigned long midr, cputype;
-
-	asm volatile("mrs %0, midr_el1" : "=r" (midr));
-	cputype = (midr >> 4) & 0xfff;
-
-	if (cputype == 0xd03)
-		writel(RST_CA53_CODE, RST_CA53RESCNT);
-	else
-		writel(RST_CA57_CODE, RST_CA57RESCNT);
-}
-
 #if defined(CONFIG_MULTI_DTB_FIT)
 /* If the firmware passed a device tree, use it for board identification. */
 extern u64 rcar_atf_boot_args[];
Signature · 1 line
2.25.1
#2 lore raw
In reply to Adam Ford
Quoted 4 lines · Adam Ford

Various RZ/G2[MNH] boards have copies of cpu_reset which creates duplicate code, so move this to a common file shared among all users of the RZG2 and declare it weak so it can be overwritten if necessary.

RCar3 has the same reset code too, so this could be unified further. However, I wonder, can't you simply call the PSCI reset ? There is a PSCI reset driver in drivers/reset/ too I think.

author
#3 lore raw
Quoted 10 lines · Marek Vasut
Quoted 4 lines · Adam Ford

Various RZ/G2[MNH] boards have copies of cpu_reset which creates duplicate code, so move this to a common file shared among all users of the RZG2 and declare it weak so it can be overwritten if necessary.

RCar3 has the same reset code too, so this could be unified further. However, I wonder, can't you simply call the PSCI reset ? There is a PSCI reset driver in drivers/reset/ too I think.

Thanks for the suggestion. I removed the custom cpu_reset code from the board file, and enabled sysreset and the psci, and that appeared to still reset when needed.

I'll send a different patch shortly.

adam

#4 lore raw
Quoted 12 lines · Adam Ford
Quoted 10 lines · Marek Vasut
Quoted 4 lines · Adam Ford

Various RZ/G2[MNH] boards have copies of cpu_reset which creates duplicate code, so move this to a common file shared among all users of the RZG2 and declare it weak so it can be overwritten if necessary.

RCar3 has the same reset code too, so this could be unified further. However, I wonder, can't you simply call the PSCI reset ? There is a PSCI reset driver in drivers/reset/ too I think.

Quoted 5 lines

Thanks for the suggestion. I removed the custom cpu_reset code from the board file, and enabled sysreset and the psci, and that appeared to still reset when needed.

I'll send a different patch shortly.

Thanks!