diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h
index f776f82396990752f4040de354c23b7f7aad2666..c43d02365fb65075e23b8811a7fa6b5e18e665c9 100644
--- a/arch/arm64/include/asm/cpufeature.h
+++ b/arch/arm64/include/asm/cpufeature.h
@@ -91,6 +91,10 @@ extern struct arm64_ftr_reg arm64_ftr_reg_ctrel0;
 
 int arm64_cpu_ftr_regs_traverse(int (*op)(u32, u64, void *), void *argp);
 
+#ifdef CONFIG_ARM64_PSEUDO_NMI
+extern bool enable_pseudo_nmi;
+#endif
+
 /*
  * CPU capabilities:
  *
diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
index 6a00aa3cc876124cf6b93b0245cb79e925c62380..822e6a2c0af1de78a2a4575b0dc13efe842c9ceb 100644
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
@@ -1230,7 +1230,7 @@ ssize_t cpu_show_meltdown(struct device *dev, struct device_attribute *attr,
 }
 
 #ifdef CONFIG_ARM64_PSEUDO_NMI
-static bool enable_pseudo_nmi;
+bool enable_pseudo_nmi;
 
 static int __init early_enable_pseudo_nmi(char *p)
 {
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index f23da539a47654325121fa9f98cb551e4b5d9cb9..a6b9048ea1a476e6f2f89d20123a86374799f20e 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -769,6 +769,9 @@ __setup("keepinitrd", keepinitrd_setup);
 #endif
 
 #ifdef CONFIG_ASCEND_FEATURES
+
+#include <linux/perf/arm_pmu.h>
+
 void ascend_enable_all_features(void)
 {
 	if (IS_ENABLED(CONFIG_ASCEND_DVPP_MMAP))
@@ -782,6 +785,13 @@ void ascend_enable_all_features(void)
 
 	if (IS_ENABLED(CONFIG_SUSPEND))
 		mem_sleep_current = PM_SUSPEND_ON;
+
+	if (IS_ENABLED(CONFIG_PMU_WATCHDOG))
+		pmu_nmi_enable = true;
+
+#ifdef CONFIG_ARM64_PSEUDO_NMI
+	enable_pseudo_nmi = true;
+#endif
 }
 
 static int __init ascend_enable_setup(char *__unused)
@@ -791,7 +801,7 @@ static int __init ascend_enable_setup(char *__unused)
 	return 1;
 }
 
-__setup("ascend_enable_all", ascend_enable_setup);
+early_param("ascend_enable_all", ascend_enable_setup);
 #endif