From a8f5711b54f8640aeadacad02f4967d2cf26b0d6 Mon Sep 17 00:00:00 2001 From: secuflag Date: Sat, 18 Apr 2020 18:10:46 +0200 Subject: [PATCH] Revert "arm64: Save and restore OSDLR_EL1 across suspend/resume" This reverts commit 8cea2e4c08b3da63b0572006711a0308dcd41403. --- arch/arm64/mm/proc.S | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S index 7e79246f8e7e..bf0821b7b1ab 100644 --- a/arch/arm64/mm/proc.S +++ b/arch/arm64/mm/proc.S @@ -100,8 +100,8 @@ ENTRY(cpu_do_resume) msr cpacr_el1, x6 /* Don't change t0sz here, mask those bits when restoring */ - mrs x7, tcr_el1 - bfi x8, x7, TCR_T0SZ_OFFSET, TCR_TxSZ_WIDTH + mrs x5, tcr_el1 + bfi x8, x5, TCR_T0SZ_OFFSET, TCR_TxSZ_WIDTH msr tcr_el1, x8 msr vbar_el1, x9 @@ -121,7 +121,6 @@ ENTRY(cpu_do_resume) /* * Restore oslsr_el1 by writing oslar_el1 */ - msr osdlr_el1, x5 ubfx x11, x11, #1, #1 msr oslar_el1, x11 reset_pmuserenr_el0 x0 // Disable PMU access from EL0