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

Commit 5fbb0df6 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

Merge tag 'kvm-arm-fixes-for-v4.16-2' into HEAD 

Resolve conflicts with current mainline
parents 4b472ffd 27e91ad1

arch/arm/kvm/hyp/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ ccflags-y += -fno-stack-protector -DDISABLE_BRANCH_PROFILING 


KVM=../../../../virt/kvm



CFLAGS_ARMV7VE		   :=$(call cc-option, -march=armv7ve)



obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v3-sr.o

obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/timer-sr.o
@@ -14,7 +16,10 @@ obj-$(CONFIG_KVM_ARM_HOST) += tlb.o 
obj-$(CONFIG_KVM_ARM_HOST) += cp15-sr.o

obj-$(CONFIG_KVM_ARM_HOST) += vfp.o

obj-$(CONFIG_KVM_ARM_HOST) += banked-sr.o

CFLAGS_banked-sr.o	   += $(CFLAGS_ARMV7VE)



obj-$(CONFIG_KVM_ARM_HOST) += entry.o

obj-$(CONFIG_KVM_ARM_HOST) += hyp-entry.o

obj-$(CONFIG_KVM_ARM_HOST) += switch.o

CFLAGS_switch.o		   += $(CFLAGS_ARMV7VE)

obj-$(CONFIG_KVM_ARM_HOST) += s2-setup.o

arch/arm/kvm/hyp/banked-sr.c

+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ 


#include <asm/kvm_hyp.h>



/*

 * gcc before 4.9 doesn't understand -march=armv7ve, so we have to

 * trick the assembler.

 */

__asm__(".arch_extension     virt");



void __hyp_text __banked_save_state(struct kvm_cpu_context *ctxt)

include/kvm/arm_vgic.h

+1 −0
Original line number Diff line number Diff line
@@ -358,6 +358,7 @@ void kvm_vgic_put(struct kvm_vcpu *vcpu); 
bool kvm_vcpu_has_pending_irqs(struct kvm_vcpu *vcpu);

void kvm_vgic_sync_hwstate(struct kvm_vcpu *vcpu);

void kvm_vgic_flush_hwstate(struct kvm_vcpu *vcpu);

void kvm_vgic_reset_mapped_irq(struct kvm_vcpu *vcpu, u32 vintid);



void vgic_v3_dispatch_sgi(struct kvm_vcpu *vcpu, u64 reg);

include/linux/irqchip/arm-gic-v3.h

+1 −0
Original line number Diff line number Diff line
@@ -503,6 +503,7 @@ 


#define ICH_HCR_EN			(1 << 0)

#define ICH_HCR_UIE			(1 << 1)

#define ICH_HCR_NPIE			(1 << 3)

#define ICH_HCR_TC			(1 << 10)

#define ICH_HCR_TALL0			(1 << 11)

#define ICH_HCR_TALL1			(1 << 12)

include/linux/irqchip/arm-gic.h

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ 


#define GICH_HCR_EN			(1 << 0)

#define GICH_HCR_UIE			(1 << 1)

#define GICH_HCR_NPIE			(1 << 3)



#define GICH_LR_VIRTUALID		(0x3ff << 0)

#define GICH_LR_PHYSID_CPUID_SHIFT	(10)