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

Commit 9975f5e3 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Alexander Graf
Browse files

kvm: powerpc: book3s: Add a new config variable CONFIG_KVM_BOOK3S_HV_POSSIBLE 



This help ups to select the relevant code in the kernel code
when we later move HV and PR bits as seperate modules. The patch
also makes the config options for PR KVM selectable

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 7aa79938

arch/powerpc/include/asm/kvm_book3s.h

+0 −2
Original line number Diff line number Diff line
@@ -199,8 +199,6 @@ static inline struct kvmppc_vcpu_book3s *to_book3s(struct kvm_vcpu *vcpu) 
	return vcpu->arch.book3s;

}



extern void kvm_return_point(void);



/* Also add subarch specific defines */



#ifdef CONFIG_KVM_BOOK3S_32_HANDLER

arch/powerpc/include/asm/kvm_book3s_64.h

+3 −3
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static inline void svcpu_put(struct kvmppc_book3s_shadow_vcpu *svcpu) 


#define SPAPR_TCE_SHIFT		12



#ifdef CONFIG_KVM_BOOK3S_64_HV

#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE

#define KVM_DEFAULT_HPT_ORDER	24	/* 16MB HPT by default */

extern unsigned long kvm_rma_pages;

#endif
@@ -278,7 +278,7 @@ static inline int is_vrma_hpte(unsigned long hpte_v) 
		(HPTE_V_1TB_SEG | (VRMA_VSID << (40 - 16)));

}



#ifdef CONFIG_KVM_BOOK3S_64_HV

#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE

/*

 * Note modification of an HPTE; set the HPTE modified bit

 * if anyone is interested.
@@ -289,6 +289,6 @@ static inline void note_hpte_modification(struct kvm *kvm, 
	if (atomic_read(&kvm->arch.hpte_mod_interest))

		rev->guest_rpte |= HPTE_GR_MODIFIED;

}

#endif /* CONFIG_KVM_BOOK3S_64_HV */

#endif /* CONFIG_KVM_BOOK3S_HV_POSSIBLE */



#endif /* __ASM_KVM_BOOK3S_64_H__ */

arch/powerpc/include/asm/kvm_book3s_asm.h

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ struct kvmppc_host_state { 
	u8 restore_hid5;

	u8 napping;



#ifdef CONFIG_KVM_BOOK3S_64_HV

#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE

	u8 hwthread_req;

	u8 hwthread_state;

	u8 host_ipi;

arch/powerpc/include/asm/kvm_host.h

+5 −5
Original line number Diff line number Diff line
@@ -224,15 +224,15 @@ struct revmap_entry { 
#define KVMPPC_GOT_PAGE		0x80



struct kvm_arch_memory_slot {

#ifdef CONFIG_KVM_BOOK3S_64_HV

#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE

	unsigned long *rmap;

	unsigned long *slot_phys;

#endif /* CONFIG_KVM_BOOK3S_64_HV */

#endif /* CONFIG_KVM_BOOK3S_HV_POSSIBLE */

};



struct kvm_arch {

	unsigned int lpid;

#ifdef CONFIG_KVM_BOOK3S_64_HV

#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE

	unsigned long hpt_virt;

	struct revmap_entry *revmap;

	unsigned int host_lpid;
@@ -256,7 +256,7 @@ struct kvm_arch { 
	cpumask_t need_tlb_flush;

	struct kvmppc_vcore *vcores[KVM_MAX_VCORES];

	int hpt_cma_alloc;

#endif /* CONFIG_KVM_BOOK3S_64_HV */

#endif /* CONFIG_KVM_BOOK3S_HV_POSSIBLE */

#ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE

	struct mutex hpt_mutex;

#endif
@@ -592,7 +592,7 @@ struct kvm_vcpu_arch { 
	struct kvmppc_icp *icp; /* XICS presentation controller */

#endif



#ifdef CONFIG_KVM_BOOK3S_64_HV

#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE

	struct kvm_vcpu_arch_shared shregs;



	unsigned long pgfault_addr;

arch/powerpc/include/asm/kvm_ppc.h

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ void kvmppc_set_pid(struct kvm_vcpu *vcpu, u32 pid); 


struct openpic;



#ifdef CONFIG_KVM_BOOK3S_64_HV

#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE

extern void kvm_cma_reserve(void) __init;

static inline void kvmppc_set_xics_phys(int cpu, unsigned long addr)

{