From: Slim6882 <55942829+jackYoung0915@users.noreply.github.com> This reverts commit 2df99617f5c63ced595e32a6b3423219df0370b8. Signed-off-by: Slim6882 <55942829+jackYoung0915@users.noreply.github.com> Signed-off-by: Qi Xi <xiqi2@huawei.com> --- arch/arm64/include/asm/sysreg.h | 17 ----------------- arch/arm64/mm/proc.S | 18 ------------------ 2 files changed, 35 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index a7e99111f821..981afb9b79a5 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -1124,23 +1124,6 @@ #define SYS_CNTV_CTL_EL02 sys_reg(3, 5, 14, 3, 1) #define SYS_CNTV_CVAL_EL02 sys_reg(3, 5, 14, 3, 2) -#define REG_ID_AA64MMFR3_EL1 S3_0_C0_C7_3 -#define SYS_ID_AA64MMFR3_EL1 sys_reg(3, 0, 0, 7, 3) -#define ID_AA64MMFR3_EL1_TCRX_SHIFT 0 -#define ID_AA64MMFR3_EL1_S1PIE_SHIFT 8 - -#define REG_TCR2_EL1 S3_0_C2_C0_3 -#define SYS_TCR2_EL1 sys_reg(3, 0, 2, 0, 3) -#define SYS_TCR2_EL1 sys_reg(3, 0, 2, 0, 3) -#define SYS_TCR2_EL1_Op0 3 -#define SYS_TCR2_EL1_Op1 0 -#define SYS_TCR2_EL1_CRn 2 -#define SYS_TCR2_EL1_CRm 0 -#define SYS_TCR2_EL1_Op2 3 - -#define TCR2_EL1x_HAFT GENMASK(11, 11) -#define TCR2_EL1x_PIE GENMASK(1, 1) - /* Common SCTLR_ELx flags. */ #define SCTLR_ELx_DSSBS (BIT(44)) #define SCTLR_ELx_ATA (BIT(43)) diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S index 25194ad4e461..1a9684b11474 100644 --- a/arch/arm64/mm/proc.S +++ b/arch/arm64/mm/proc.S @@ -420,12 +420,10 @@ SYM_FUNC_START(__cpu_setup) */ mair .req x17 tcr .req x16 - tcr2 .req x15 mov_q mair, MAIR_EL1_SET mov_q tcr, TCR_TxSZ(VA_BITS) | TCR_CACHE_FLAGS | TCR_SMP_FLAGS | \ TCR_TG_FLAGS | TCR_KASLR_FLAGS | TCR_ASID16 | \ TCR_TBI0 | TCR_A1 | TCR_KASAN_SW_FLAGS | TCR_MTE_FLAGS - mov tcr2, xzr tcr_clear_errata_bits tcr, x9, x5 @@ -457,21 +455,6 @@ SYM_FUNC_START(__cpu_setup) #endif /* CONFIG_ARM64_HW_AFDBM */ msr mair_el1, mair msr tcr_el1, tcr - - mrs_s x1, SYS_ID_AA64MMFR3_EL1 - ubfx x1, x1, #ID_AA64MMFR3_EL1_S1PIE_SHIFT, #4 - cbz x1, .Lskip_indirection - - orr tcr2, tcr2, TCR2_EL1x_PIE - -.Lskip_indirection: - - mrs_s x1, SYS_ID_AA64MMFR3_EL1 - ubfx x1, x1, #ID_AA64MMFR3_EL1_TCRX_SHIFT, #4 - cbz x1, 1f - msr REG_TCR2_EL1, tcr2 -1: - /* * Prepare SCTLR */ @@ -480,5 +463,4 @@ SYM_FUNC_START(__cpu_setup) .unreq mair .unreq tcr - .unreq tcr2 SYM_FUNC_END(__cpu_setup) -- 2.33.0