diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c
index 922add8adb7498ff4609725782d09a56b46781d6..3c0e9383d7e0ea1423844a333f5d69d7987ead0a 100644
--- a/arch/arm64/kernel/machine_kexec.c
+++ b/arch/arm64/kernel/machine_kexec.c
@@ -13,6 +13,7 @@
 #include <linux/irq.h>
 #include <linux/kernel.h>
 #include <linux/kexec.h>
+#include <linux/nmi.h>
 #include <linux/page-flags.h>
 #include <linux/smp.h>
 
@@ -260,6 +261,15 @@ void machine_crash_shutdown(struct pt_regs *regs)
 	/* shutdown non-crashing cpus */
 	crash_smp_send_stop();
 
+	/*
+	 * when we panic in hardlockup detected by sdei_watchdog, the secure
+	 * timer interrupt remains activate here because firmware clear eoi
+	 * after dispatch is completed. This will cause arm_arch_timer
+	 * interrupt failed to trigger in the second kernel. So we clear eoi
+	 * of the secure timer before booting the second kernel.
+	 */
+	sdei_watchdog_clear_eoi();
+
 	/* for crashing cpu */
 	crash_save_cpu(regs, smp_processor_id());
 	machine_kexec_mask_interrupts();
diff --git a/arch/arm64/kernel/watchdog_sdei.c b/arch/arm64/kernel/watchdog_sdei.c
index e36c4d398893b8875224539ad60842488204625a..99ab9bdfdee6e891afdbb0f560beb72ff3154f01 100644
--- a/arch/arm64/kernel/watchdog_sdei.c
+++ b/arch/arm64/kernel/watchdog_sdei.c
@@ -80,6 +80,12 @@ static int __init disable_sdei_nmi_watchdog_setup(char *str)
 }
 __setup("disable_sdei_nmi_watchdog", disable_sdei_nmi_watchdog_setup);
 
+void sdei_watchdog_clear_eoi(void)
+{
+	if (sdei_watchdog_registered)
+		sdei_api_clear_eoi(SDEI_NMI_WATCHDOG_HWIRQ);
+}
+
 int __init watchdog_nmi_probe(void)
 {
 	int ret;
diff --git a/drivers/firmware/arm_sdei.c b/drivers/firmware/arm_sdei.c
index 14029c54b70bb3f37f1f8bd6407d4263f25ce3b3..9231acf5d2e3ae13f4a03c2e89da613719b46528 100644
--- a/drivers/firmware/arm_sdei.c
+++ b/drivers/firmware/arm_sdei.c
@@ -200,6 +200,12 @@ int sdei_api_event_interrupt_bind(int hwirq)
 	return (int)event_number;
 }
 
+int sdei_api_clear_eoi(int hwirq)
+{
+	return invoke_sdei_fn(SDEI_1_0_FN_SDEI_CLEAR_EOI, hwirq, 0, 0, 0, 0,
+			NULL);
+}
+
 static int sdei_api_event_get_info(u32 event, u32 info, u64 *result)
 {
 	return invoke_sdei_fn(SDEI_1_0_FN_SDEI_EVENT_GET_INFO, event, info, 0,
diff --git a/include/linux/arm_sdei.h b/include/linux/arm_sdei.h
index fd735c1284da85110a63062e8f19f0c7eede09af..990f4234b244c6ddefb08a6ed953c7c331e9e9d7 100644
--- a/include/linux/arm_sdei.h
+++ b/include/linux/arm_sdei.h
@@ -41,6 +41,7 @@ int sdei_event_disable(u32 event_num);
 int sdei_api_event_interrupt_bind(int hwirq);
 int sdei_api_event_disable(u32 event_num);
 int sdei_api_event_enable(u32 event_num);
+int sdei_api_clear_eoi(int hwirq);
 
 #ifdef CONFIG_ARM_SDE_INTERFACE
 /* For use by arch code when CPU hotplug notifiers are not appropriate. */
diff --git a/include/linux/nmi.h b/include/linux/nmi.h
index f65cfbb5d46cc8e4c8e4975ca27dbe667dfd4ceb..5e1facadc0aa49e23757ffc89030877c00ab5aec 100644
--- a/include/linux/nmi.h
+++ b/include/linux/nmi.h
@@ -225,4 +225,10 @@ extern int proc_watchdog_cpumask(struct ctl_table *, int,
 #include <asm/nmi.h>
 #endif
 
+#ifdef CONFIG_SDEI_WATCHDOG
+void sdei_watchdog_clear_eoi(void);
+#else
+static inline void sdei_watchdog_clear_eoi(void) { }
+#endif
+
 #endif
diff --git a/include/uapi/linux/arm_sdei.h b/include/uapi/linux/arm_sdei.h
index af0630ba5437d4f3f15f4ee0b4ca94843a813a9f..9a810e7883ed221a15bad807a2ced331e4b7217b 100644
--- a/include/uapi/linux/arm_sdei.h
+++ b/include/uapi/linux/arm_sdei.h
@@ -24,6 +24,7 @@
 #define SDEI_1_0_FN_SDEI_INTERRUPT_RELEASE		SDEI_1_0_FN(0x0E)
 #define SDEI_1_0_FN_SDEI_PRIVATE_RESET			SDEI_1_0_FN(0x11)
 #define SDEI_1_0_FN_SDEI_SHARED_RESET			SDEI_1_0_FN(0x12)
+#define SDEI_1_0_FN_SDEI_CLEAR_EOI			SDEI_1_0_FN(0xD0)
 
 #define SDEI_VERSION_MAJOR_SHIFT			48
 #define SDEI_VERSION_MAJOR_MASK				0x7fff