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

Commit 65612e87 authored by Will Deacon's avatar Will Deacon Committed by Channagoud Kadabi
Browse files

UPSTREAM: arm64: mm: Rename post_ttbr0_update_workaround 



The post_ttbr0_update_workaround hook applies to any change to TTBRx_EL1.
Since we're using TTBR1 for the ASID, rename the hook to make it clearer
as to what it's doing.

Reviewed-by: default avatarMark Rutland <mark.rutland@arm.com>
Tested-by: default avatarLaura Abbott <labbott@redhat.com>
Tested-by: default avatarShanker Donthineni <shankerd@codeaurora.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
(cherry picked from commit 158d495899ce55db453f682a8ac8390d5a426578)

[toddpoynor@google.com: fixup context conflict in comments]
Change-Id: Ia0f82eee78ad442d1773245b99c7534f0ea066e4
Signed-off-by: default avatarTodd Poynor <toddpoynor@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Git-commit: 071a49fc
Git-repo: https://android.googlesource.com/kernel/common


Signed-off-by: default avatarChannagoud Kadabi <ckadabi@codeaurora.org>
parent 74e1ae3b

arch/arm64/include/asm/assembler.h

+2 −2
Original line number Diff line number Diff line
@@ -453,9 +453,9 @@ alternative_endif 
	.endm



/*

 * Errata workaround post TTBR0_EL1 update.

 * Errata workaround post TTBRx_EL1 update.

 */

	.macro	post_ttbr0_update_workaround

	.macro	post_ttbr_update_workaround

#ifdef CONFIG_CAVIUM_ERRATUM_27456

alternative_if ARM64_WORKAROUND_CAVIUM_27456

	ic	iallu

arch/arm64/kernel/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ alternative_else_nop_endif 
	 * Cavium erratum 27456 (broadcast TLBI instructions may cause I-cache

	 * corruption).

	 */

	post_ttbr0_update_workaround

	post_ttbr_update_workaround

	.endif

1:

	.if	\el != 0

arch/arm64/mm/proc.S

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ ENTRY(cpu_do_switch_mm) 
	isb

	msr	ttbr0_el1, x0			// now update TTBR0

	isb

	post_ttbr0_update_workaround

	post_ttbr_update_workaround

	ret

ENDPROC(cpu_do_switch_mm)