Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit beb75504 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "UPSTREAM: arm64: erratum: Work around Falkor erratum #E1003 in trampoline code"

parents 6e63ec32 1f911ed3

arch/arm64/kernel/entry.S

+10 −0
Original line number Diff line number Diff line
@@ -909,6 +909,16 @@ __ni_sys_trace: 
	sub	\tmp, \tmp, #(SWAPPER_DIR_SIZE + RESERVED_TTBR0_SIZE)

	bic	\tmp, \tmp, #USER_ASID_FLAG

	msr	ttbr1_el1, \tmp

#ifdef CONFIG_ARCH_MSM8996

	/* ASID already in \tmp[63:48] */

	movk	\tmp, #:abs_g2_nc:(TRAMP_VALIAS >> 12)

	movk	\tmp, #:abs_g1_nc:(TRAMP_VALIAS >> 12)

	/* 2MB boundary containing the vectors, so we nobble the walk cache */

	movk	\tmp, #:abs_g0_nc:((TRAMP_VALIAS & ~(SZ_2M - 1)) >> 12)

	isb

	tlbi	vae1, \tmp

	dsb	nsh

#endif /* CONFIG_ARCH_MSM8996 */

	.endm



	.macro tramp_unmap_kernel, tmp