diff --git a/arch/arm64/include/asm/mpam.h b/arch/arm64/include/asm/mpam.h
index 8caac70e22ed57ea39852a9cf822af8938c10453..db4d559e8936cb3fa95120aeea5fe32d84a3079f 100644
--- a/arch/arm64/include/asm/mpam.h
+++ b/arch/arm64/include/asm/mpam.h
@@ -161,6 +161,7 @@ static inline void mpam_thread_switch(struct task_struct *tsk)
 		return;
 
 	/* Synchronising this write is left until the ERET to EL0 */
+	write_sysreg_s(regval, SYS_MPAM1_EL1);
 	write_sysreg_s(regval, SYS_MPAM0_EL1);
 	WRITE_ONCE(per_cpu(arm64_mpam_current, cpu), regval);
 }
diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
index 414b9d28ecd12d9f9dca5c731cd0d1fd91f6ad95..4cc8691dc7d866ec729eeb1d49d51df43a8aaa16 100644
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
@@ -2425,7 +2425,7 @@ cpu_enable_mpam(const struct arm64_cpu_capabilities *entry)
 	 * where latency sensitive tasks have to wait for a task that has
 	 * been throttled to release the lock.
 	 */
-	write_sysreg_s(0, SYS_MPAM1_EL1);
+	write_sysreg_s(regval, SYS_MPAM1_EL1);
 	write_sysreg_s(regval, SYS_MPAM0_EL1);
 }
 
diff --git a/arch/arm64/kernel/mpam.c b/arch/arm64/kernel/mpam.c
index 3f070cbab420651273d407dbd86b95ec483501bd..008c44c96a75d773ec98d9362185c5cbdf3646c0 100644
--- a/arch/arm64/kernel/mpam.c
+++ b/arch/arm64/kernel/mpam.c
@@ -40,9 +40,9 @@ static int mpam_pm_notifier(struct notifier_block *self,
 		 * value has changed under our feet.
 		 */
 		regval = READ_ONCE(per_cpu(arm64_mpam_current, cpu));
-		write_sysreg_s(0, SYS_MPAM1_EL1);
+		write_sysreg_s(regval, SYS_MPAM1_EL1);
 		write_sysreg_s(regval, SYS_MPAM0_EL1);
-
+		wmb();
 		return NOTIFY_OK;
 	default:
 		return NOTIFY_DONE;