Skip to contentSkip to conversation

AM62x ESM support

PATCH In review Julien Panis 2 participants 7 messages Jul 1, 2022 – Jul 25, 2022

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

cover AM62x ESM support

[ERRATUM] Patch sent previously with wrong subject prefix. I am sorry.

This patch series adds support for AM62x ESM (Error Signaling Modules).

The Error Signaling Module (ESM) aggregates events and errors from throughout the device into one location. It can signal interrupts to a processor to deal with an event, and manipulate an error pin to signal an external hardware that an error has occurred. Therefore an external controller is able to reset the device. Two ESM can be used : one for main domain devices and another one for MCU domain devices. Event outputs generated by main ESM can be routed to MCU ESM as inputs, and trigger MCU ESM generating its event outputs.

Following are required in defconfig:

	CONFIG_ESM_K3=y
	CONFIG_SPL_MISC=y
	CONFIG_SPL_DRIVERS_MISC=y

Julien Panis (3):
arm64: dts: k3-am625-r5: Add support for ESM devices
arm64: mach-k3: am625_init: Probe ESM nodes
configs: am62x_evm_r5: Add support for ESM

 arch/arm/dts/k3-am625-r5-sk.dts               | 16 +++++++++++++
 arch/arm/mach-k3/am625_init.c                 | 23 +++++++++++++++++++
 arch/arm/mach-k3/include/mach/am62_hardware.h |  3 +++
 configs/am62x_evm_r5_defconfig                |  3 +++
 4 files changed, 45 insertions(+)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/3 arm64: dts: k3-am625-r5: Add support for ESM devices

Add main ESM and MCU ESM nodes to AM625-R5 device tree.

---
 arch/arm/dts/k3-am625-r5-sk.dts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
arch/arm/dts/k3-am625-r5-sk.dts +16 -0
index 2691af40a145..54896937d270 100644
@@ -78,6 +78,15 @@
 	ti,secure-host;
 };
 
+&cbass_mcu {
+	mcu_esm: esm@4100000 {
+		compatible = "ti,j721e-esm";
+		reg = <0x0 0x4100000 0x0 0x1000>;
+		ti,esm-pins = <0>, <1>, <2>, <85>;
+		u-boot,dm-spl;
+	};
+};
+
 &cbass_main {
 	sa3_secproxy: secproxy@44880000 {
 		u-boot,dm-spl;
@@ -95,6 +104,13 @@
 		mbox-names = "tx", "rx", "boot_notify";
 		u-boot,dm-spl;
 	};
+
+	main_esm: esm@420000 {
+		compatible = "ti,j721e-esm";
+		reg = <0x0 0x420000 0x0 0x1000>;
+		ti,esm-pins = <160>, <161>, <162>, <163>, <177>, <178>;
+		u-boot,dm-spl;
+	};
 };
 
 &mcu_pmx0 {
Signature · 1 line
2.25.1
#2 lore raw

Re: [PATCH v1 1/3] arm64: dts: k3-am625-r5: Add support for ESM devices

Quoted 3 lines · Julien Panis

Add main ESM and MCU ESM nodes to AM625-R5 device tree.

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
#3 lore raw

PATCH 2/3 arm64: mach-k3: am625_init: Probe ESM nodes

In reply to Julien Panis

On AM62x devices, main ESM error event outputs can be routed to MCU ESM as inputs. So, two ESM device nodes are expected in the device tree : one for main ESM and another one for MCU ESM. MCU ESM error output can trigger the reset logic to reset the device when CTRLMMR_MCU_RST_CTRL:MCU_ESM_ERROR_RESET_EN_Z is set to '0'.

---
 arch/arm/mach-k3/am625_init.c                 | 23 +++++++++++++++++++
 arch/arm/mach-k3/include/mach/am62_hardware.h |  3 +++
 2 files changed, 26 insertions(+)
arch/arm/mach-k3/am625_init.c +23 -0
index 0d9525992bb0..dfd95b8053b5 100644
@@ -64,6 +64,15 @@ static void ctrl_mmr_unlock(void)
 	mmr_unlock(PADCFG_MMR1_BASE, 1);
 }
 
+static __maybe_unused void enable_mcu_esm_reset(void)
+{
+	/* Set CTRLMMR_MCU_RST_CTRL:MCU_ESM_ERROR_RST_EN_Z  to '0' (low active) */
+	u32 stat = readl(CTRLMMR_MCU_RST_CTRL);
+
+	stat &= RST_CTRL_ESM_ERROR_RST_EN_Z_MASK;
+	writel(stat, CTRLMMR_MCU_RST_CTRL);
+}
+
 void board_init_f(ulong dummy)
 {
 	struct udevice *dev;
@@ -142,6 +151,20 @@ void board_init_f(ulong dummy)
 	/* Output System Firmware version info */
 	k3_sysfw_print_ver();
 
+	if (IS_ENABLED(CONFIG_ESM_K3)) {
+		/* Probe/configure ESM0 */
+		ret = uclass_get_device_by_name(UCLASS_MISC, "esm@420000", &dev);
+		if (ret)
+			printf("esm main init failed: %d\n", ret);
+
+		/* Probe/configure MCUESM */
+		ret = uclass_get_device_by_name(UCLASS_MISC, "esm@4100000", &dev);
+		if (ret)
+			printf("esm mcu init failed: %d\n", ret);
+
+		enable_mcu_esm_reset();
+	}
+
 #if defined(CONFIG_K3_AM64_DDRSS)
 	ret = uclass_get_device(UCLASS_RAM, 0, &dev);
 	if (ret)
arch/arm/mach-k3/include/mach/am62_hardware.h +3 -0
index cfabd20cbd79..9118d052042a 100644
@@ -29,6 +29,7 @@
 #define MAIN_DEVSTAT_BACKUP_BOOTMODE_SHIFT	10
 #define MAIN_DEVSTAT_BACKUP_BOOTMODE_CFG_MASK	BIT(13)
 #define MAIN_DEVSTAT_BACKUP_BOOTMODE_CFG_SHIFT	13
+#define RST_CTRL_ESM_ERROR_RST_EN_Z_MASK	(~BIT(17))
 
 /* Primary Bootmode MMC Config macros */
 #define MAIN_DEVSTAT_PRIMARY_MMC_PORT_MASK	0x4
@@ -67,6 +68,8 @@
 #define MCU_CTRL_DEVICE_CLKOUT_32K_CTRL		(MCU_CTRL_MMR0_BASE + 0x8058)
 #define MCU_CTRL_DEVICE_CLKOUT_LFOSC_SELECT_VAL	(0x3)
 
+#define CTRLMMR_MCU_RST_CTRL			(MCU_CTRL_MMR0_BASE + 0x18170)
+
 #define ROM_ENTENDED_BOOT_DATA_INFO		0x43c3f1e0
 
 /* Use Last 2K as Scratch pad */
Signature · 1 line
2.25.1
#4 lore raw

Re: [PATCH v1 2/3] arm64: mach-k3: am625_init: Probe ESM nodes

Quoted 8 lines · Julien Panis

On AM62x devices, main ESM error event outputs can be routed to MCU ESM as inputs. So, two ESM device nodes are expected in the device tree : one for main ESM and another one for MCU ESM. MCU ESM error output can trigger the reset logic to reset the device when CTRLMMR_MCU_RST_CTRL:MCU_ESM_ERROR_RESET_EN_Z is set to '0'.

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
#5 lore raw

PATCH 3/3 configs: am62x_evm_r5: Add support for ESM

In reply to Julien Panis

Enable ESM driver for AM62x in R5 SPL/u-boot build.

---
 configs/am62x_evm_r5_defconfig | 3 +++
 1 file changed, 3 insertions(+)
configs/am62x_evm_r5_defconfig +3 -0
index 2e340cd6f416..64cd4a4acd09 100644
@@ -96,3 +96,6 @@ CONFIG_SPL_TIMER=y
 CONFIG_OMAP_TIMER=y
 CONFIG_LIB_RATIONAL=y
 CONFIG_SPL_LIB_RATIONAL=y
+CONFIG_ESM_K3=y
+CONFIG_SPL_MISC=y
+CONFIG_SPL_DRIVERS_MISC=y
Signature · 1 line
2.25.1
#6 lore raw

Re: [PATCH v1 3/3] configs: am62x_evm_r5: Add support for ESM

Quoted 3 lines · Julien Panis

Enable ESM driver for AM62x in R5 SPL/u-boot build.

Applied to u-boot/master, thanks!

Signature · 1 line
Tom