diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 16:46:06 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 16:46:06 -0400 |
| commit | 8eda99fc6e800ec347ed8c7db9e7d1642b0c6039 (patch) | |
| tree | 6f47f90d506affa82ae978fe43402fb54b31cf0f | |
| parent | 8fb465b0b9f3709a77a1cdd0d32389c685fc8ec2 (diff) | |
| download | longterm-queue-4.12-8eda99fc6e800ec347ed8c7db9e7d1642b0c6039.tar.gz | |
arm64: trivial context refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/arm64-ssbd-Restore-mitigation-status-on-CPU-resume.patch | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/queue/arm64-ssbd-Restore-mitigation-status-on-CPU-resume.patch b/queue/arm64-ssbd-Restore-mitigation-status-on-CPU-resume.patch index 3905146..e737bf9 100644 --- a/queue/arm64-ssbd-Restore-mitigation-status-on-CPU-resume.patch +++ b/queue/arm64-ssbd-Restore-mitigation-status-on-CPU-resume.patch @@ -1,4 +1,4 @@ -From 647d0519b53f440a55df163de21c52a8205431cc Mon Sep 17 00:00:00 2001 +From 34e137a1cee580e89050ee93d19067066fd16656 Mon Sep 17 00:00:00 2001 From: Marc Zyngier <marc.zyngier@arm.com> Date: Tue, 29 May 2018 13:11:12 +0100 Subject: [PATCH] arm64: ssbd: Restore mitigation status on CPU resume @@ -20,12 +20,13 @@ Acked-by: Will Deacon <will.deacon@arm.com> Reviewed-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h -index b0fc3224ce8a..55bc1f073bfb 100644 +index a2415ee6b8a3..c5bc80a03515 100644 --- a/arch/arm64/include/asm/cpufeature.h +++ b/arch/arm64/include/asm/cpufeature.h -@@ -553,6 +553,12 @@ static inline int arm64_get_ssbd_state(void) +@@ -278,6 +278,12 @@ static inline int arm64_get_ssbd_state(void) #endif } @@ -39,10 +40,10 @@ index b0fc3224ce8a..55bc1f073bfb 100644 #endif diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c -index 2797bc2c8c6a..cf37ca6fa5f2 100644 +index 23905cc19a1a..c0ec799fc398 100644 --- a/arch/arm64/kernel/cpu_errata.c +++ b/arch/arm64/kernel/cpu_errata.c -@@ -303,7 +303,7 @@ void __init arm64_enable_wa2_handling(struct alt_instr *alt, +@@ -299,7 +299,7 @@ void __init arm64_enable_wa2_handling(struct alt_instr *alt, *updptr = cpu_to_le32(aarch64_insn_gen_nop()); } @@ -52,7 +53,7 @@ index 2797bc2c8c6a..cf37ca6fa5f2 100644 switch (psci_ops.conduit) { case PSCI_CONDUIT_HVC: diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.c -index 1ec5f28c39fc..6b2686d54411 100644 +index a44e13942d30..94743bc2c7d7 100644 --- a/arch/arm64/kernel/hibernate.c +++ b/arch/arm64/kernel/hibernate.c @@ -313,6 +313,17 @@ int swsusp_arch_suspend(void) @@ -72,12 +73,12 @@ index 1ec5f28c39fc..6b2686d54411 100644 + } } - local_daif_restore(flags); + local_dbg_restore(flags); diff --git a/arch/arm64/kernel/suspend.c b/arch/arm64/kernel/suspend.c -index a307b9e13392..70c283368b64 100644 +index 1e3be9064cfa..e12f2d0dfc5d 100644 --- a/arch/arm64/kernel/suspend.c +++ b/arch/arm64/kernel/suspend.c -@@ -62,6 +62,14 @@ void notrace __cpu_suspend_exit(void) +@@ -61,6 +61,14 @@ void notrace __cpu_suspend_exit(void) */ if (hw_breakpoint_restore) hw_breakpoint_restore(cpu); |