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

Commit b5525ce8 authored by Vladimir Murzin's avatar Vladimir Murzin Committed by Christoffer Dall
Browse files

arm64: KVM: Move GIC accessors to arch_gicv3.h 



Since we are going to share vgic-v3 save/restore code with ARM keep
arch specific accessors separately.

Signed-off-by: default avatarVladimir Murzin <vladimir.murzin@arm.com>
Acked-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent 5a7a8426

arch/arm64/include/asm/arch_gicv3.h

+13 −0
Original line number Diff line number Diff line
@@ -79,6 +79,19 @@ 
#include <linux/stringify.h>

#include <asm/barrier.h>



#define read_gicreg(r)							\

	({								\

		u64 reg;						\

		asm volatile("mrs_s %0, " __stringify(r) : "=r" (reg));	\

		reg;							\

	})



#define write_gicreg(v,r)						\

	do {								\

		u64 __val = (v);					\

		asm volatile("msr_s " __stringify(r) ", %0" : : "r" (__val));\

	} while (0)



/*

 * Low-level accessors

 *

arch/arm64/kvm/hyp/vgic-v3-sr.c

+0 −13
Original line number Diff line number Diff line
@@ -24,19 +24,6 @@ 
#define vtr_to_max_lr_idx(v)		((v) & 0xf)

#define vtr_to_nr_pri_bits(v)		(((u32)(v) >> 29) + 1)



#define read_gicreg(r)							\

	({								\

		u64 reg;						\

		asm volatile("mrs_s %0, " __stringify(r) : "=r" (reg));	\

		reg;							\

	})



#define write_gicreg(v,r)						\

	do {								\

		u64 __val = (v);					\

		asm volatile("msr_s " __stringify(r) ", %0" : : "r" (__val));\

	} while (0)



static u64 __hyp_text __gic_v3_get_lr(unsigned int lr)

{

	switch (lr & 0xf) {