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

Commit fc032421 authored by Daniel Thompson's avatar Daniel Thompson Committed by Will Deacon
Browse files

arm64: kvm: Adopt new alternative assembler macros 



Convert the dynamic patching for ARM64_HAS_SYSREG_GIC_CPUIF over to
the newly added alternative assembler macros.

Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarDaniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent e28cabf1

arch/arm64/kvm/hyp.S

+10 −2
Original line number Diff line number Diff line
@@ -810,7 +810,11 @@ 
 * Call into the vgic backend for state saving

 */

.macro save_vgic_state

	alternative_insn "bl __save_vgic_v2_state", "bl __save_vgic_v3_state", ARM64_HAS_SYSREG_GIC_CPUIF

alternative_if_not ARM64_HAS_SYSREG_GIC_CPUIF

	bl	__save_vgic_v2_state

alternative_else

	bl	__save_vgic_v3_state

alternative_endif

	mrs	x24, hcr_el2

	mov	x25, #HCR_INT_OVERRIDE

	neg	x25, x25
@@ -827,7 +831,11 @@ 
	orr	x24, x24, #HCR_INT_OVERRIDE

	orr	x24, x24, x25

	msr	hcr_el2, x24

	alternative_insn "bl __restore_vgic_v2_state", "bl __restore_vgic_v3_state", ARM64_HAS_SYSREG_GIC_CPUIF

alternative_if_not ARM64_HAS_SYSREG_GIC_CPUIF

	bl	__restore_vgic_v2_state

alternative_else

	bl	__restore_vgic_v3_state

alternative_endif

.endm



.macro save_timer_state