Commit 5b39db60 authored by Dave Martin's avatar Dave Martin Committed by Will Deacon
Browse files

arm64: el2_setup.h: Rename some labels to be more diff-friendly 



A minor anti-pattern has established itself in __init_el2_fgt,
where each block of instructions is skipped by jumping to a label
named for the next (typically unrelated) block.

This makes diffs more noisy than necessary, since appending each
new block to deal with some new architecture feature now requires
altering a branch destination in the existing code.

Fix it by naming the affected labels based on the block that is
skipping itself instead, as is done elsewhere in the el2_setup code.

No functional change.

Signed-off-by: default avatarDave Martin <Dave.Martin@arm.com>
Link: https://lore.kernel.org/r/20240729162542.367059-1-Dave.Martin@arm.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent fc2220c9

arch/arm64/include/asm/el2_setup.h

+10 −7
Original line number Diff line number Diff line
@@ -165,42 +165,45 @@ 
	mrs	x1, id_aa64dfr0_el1

	ubfx	x1, x1, #ID_AA64DFR0_EL1_PMSVer_SHIFT, #4

	cmp	x1, #3

	b.lt	.Lset_debug_fgt_\@

	b.lt	.Lskip_spe_fgt_\@

	/* Disable PMSNEVFR_EL1 read and write traps */

	orr	x0, x0, #(1 << 62)



.Lset_debug_fgt_\@:

.Lskip_spe_fgt_\@:

	msr_s	SYS_HDFGRTR_EL2, x0

	msr_s	SYS_HDFGWTR_EL2, x0



	mov	x0, xzr

	mrs	x1, id_aa64pfr1_el1

	ubfx	x1, x1, #ID_AA64PFR1_EL1_SME_SHIFT, #4

	cbz	x1, .Lset_pie_fgt_\@

	cbz	x1, .Lskip_debug_fgt_\@



	/* Disable nVHE traps of TPIDR2 and SMPRI */

	orr	x0, x0, #HFGxTR_EL2_nSMPRI_EL1_MASK

	orr	x0, x0, #HFGxTR_EL2_nTPIDR2_EL0_MASK



.Lset_pie_fgt_\@:

.Lskip_debug_fgt_\@:

	mrs_s	x1, SYS_ID_AA64MMFR3_EL1

	ubfx	x1, x1, #ID_AA64MMFR3_EL1_S1PIE_SHIFT, #4

	cbz	x1, .Lset_fgt_\@

	cbz	x1, .Lskip_pie_fgt_\@



	/* Disable trapping of PIR_EL1 / PIRE0_EL1 */

	orr	x0, x0, #HFGxTR_EL2_nPIR_EL1

	orr	x0, x0, #HFGxTR_EL2_nPIRE0_EL1



.Lset_fgt_\@:

.Lskip_pie_fgt_\@:

	msr_s	SYS_HFGRTR_EL2, x0

	msr_s	SYS_HFGWTR_EL2, x0

	msr_s	SYS_HFGITR_EL2, xzr



	mrs	x1, id_aa64pfr0_el1		// AMU traps UNDEF without AMU

	ubfx	x1, x1, #ID_AA64PFR0_EL1_AMU_SHIFT, #4

	cbz	x1, .Lskip_fgt_\@

	cbz	x1, .Lskip_amu_fgt_\@



	msr_s	SYS_HAFGRTR_EL2, xzr



.Lskip_amu_fgt_\@:



.Lskip_fgt_\@:

.endm