Commit b104e41c authored by Michael Ellerman's avatar Michael Ellerman
Browse files

Merge branch 'topic/ppc-kvm' into next 

Merge our KVM topic branch.
parents a5fc286f ad55bae7

arch/powerpc/include/asm/iommu.h

+2 −4
Original line number Original line Diff line number Diff line
@@ -51,13 +51,11 @@ struct iommu_table_ops { 
	int (*xchg_no_kill)(struct iommu_table *tbl,

	int (*xchg_no_kill)(struct iommu_table *tbl,

			long index,

			long index,

			unsigned long *hpa,

			unsigned long *hpa,

			enum dma_data_direction *direction,

			enum dma_data_direction *direction);

			bool realmode);





	void (*tce_kill)(struct iommu_table *tbl,

	void (*tce_kill)(struct iommu_table *tbl,

			unsigned long index,

			unsigned long index,

			unsigned long pages,

			unsigned long pages);

			bool realmode);





	__be64 *(*useraddrptr)(struct iommu_table *tbl, long index, bool alloc);

	__be64 *(*useraddrptr)(struct iommu_table *tbl, long index, bool alloc);

#endif

#endif

arch/powerpc/include/asm/kvm_book3s_asm.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -14,9 +14,6 @@ 
#define XICS_MFRR		0xc

#define XICS_MFRR		0xc

#define XICS_IPI		2	/* interrupt source # for IPIs */

#define XICS_IPI		2	/* interrupt source # for IPIs */





/* LPIDs we support with this build -- runtime limit may be lower */

#define KVMPPC_NR_LPIDS			(LPID_RSVD + 1)



/* Maximum number of threads per physical core */

/* Maximum number of threads per physical core */

#define MAX_SMT_THREADS		8

#define MAX_SMT_THREADS		8

arch/powerpc/include/asm/kvm_host.h

+7 −3
Original line number Original line Diff line number Diff line
@@ -36,7 +36,12 @@ 
#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE

#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE

#include <asm/kvm_book3s_asm.h>		/* for MAX_SMT_THREADS */

#include <asm/kvm_book3s_asm.h>		/* for MAX_SMT_THREADS */

#define KVM_MAX_VCPU_IDS	(MAX_SMT_THREADS * KVM_MAX_VCORES)

#define KVM_MAX_VCPU_IDS	(MAX_SMT_THREADS * KVM_MAX_VCORES)

#define KVM_MAX_NESTED_GUESTS	KVMPPC_NR_LPIDS



/*

 * Limit the nested partition table to 4096 entries (because that's what

 * hardware supports). Both guest and host use this value.

 */

#define KVM_MAX_NESTED_GUESTS_SHIFT	12





#else

#else

#define KVM_MAX_VCPU_IDS	KVM_MAX_VCPUS

#define KVM_MAX_VCPU_IDS	KVM_MAX_VCPUS
@@ -327,8 +332,7 @@ struct kvm_arch { 
	struct list_head uvmem_pfns;

	struct list_head uvmem_pfns;

	struct mutex mmu_setup_lock;	/* nests inside vcpu mutexes */

	struct mutex mmu_setup_lock;	/* nests inside vcpu mutexes */

	u64 l1_ptcr;

	u64 l1_ptcr;

	int max_nested_lpid;

	struct idr kvm_nested_guest_idr;

	struct kvm_nested_guest *nested_guests[KVM_MAX_NESTED_GUESTS];

	/* This array can grow quite large, keep it at the end */

	/* This array can grow quite large, keep it at the end */

	struct kvmppc_vcore *vcores[KVM_MAX_VCORES];

	struct kvmppc_vcore *vcores[KVM_MAX_VCORES];

#endif

#endif

arch/powerpc/include/asm/kvm_ppc.h

+2 −12
Original line number Original line Diff line number Diff line
@@ -177,8 +177,6 @@ extern void kvmppc_setup_partition_table(struct kvm *kvm); 




extern long kvm_vm_ioctl_create_spapr_tce(struct kvm *kvm,

extern long kvm_vm_ioctl_create_spapr_tce(struct kvm *kvm,

				struct kvm_create_spapr_tce_64 *args);

				struct kvm_create_spapr_tce_64 *args);

extern struct kvmppc_spapr_tce_table *kvmppc_find_table(

		struct kvm *kvm, unsigned long liobn);

#define kvmppc_ioba_validate(stt, ioba, npages)                         \

#define kvmppc_ioba_validate(stt, ioba, npages)                         \

		(iommu_tce_check_ioba((stt)->page_shift, (stt)->offset, \

		(iommu_tce_check_ioba((stt)->page_shift, (stt)->offset, \

				(stt)->size, (ioba), (npages)) ?        \

				(stt)->size, (ioba), (npages)) ?        \
@@ -685,7 +683,7 @@ extern int kvmppc_xive_set_irq(struct kvm *kvm, int irq_source_id, u32 irq, 
			       int level, bool line_status);

			       int level, bool line_status);

extern void kvmppc_xive_push_vcpu(struct kvm_vcpu *vcpu);

extern void kvmppc_xive_push_vcpu(struct kvm_vcpu *vcpu);

extern void kvmppc_xive_pull_vcpu(struct kvm_vcpu *vcpu);

extern void kvmppc_xive_pull_vcpu(struct kvm_vcpu *vcpu);

extern void kvmppc_xive_rearm_escalation(struct kvm_vcpu *vcpu);

extern bool kvmppc_xive_rearm_escalation(struct kvm_vcpu *vcpu);





static inline int kvmppc_xive_enabled(struct kvm_vcpu *vcpu)

static inline int kvmppc_xive_enabled(struct kvm_vcpu *vcpu)

{

{
@@ -723,7 +721,7 @@ static inline int kvmppc_xive_set_irq(struct kvm *kvm, int irq_source_id, u32 ir 
				      int level, bool line_status) { return -ENODEV; }

				      int level, bool line_status) { return -ENODEV; }

static inline void kvmppc_xive_push_vcpu(struct kvm_vcpu *vcpu) { }

static inline void kvmppc_xive_push_vcpu(struct kvm_vcpu *vcpu) { }

static inline void kvmppc_xive_pull_vcpu(struct kvm_vcpu *vcpu) { }

static inline void kvmppc_xive_pull_vcpu(struct kvm_vcpu *vcpu) { }

static inline void kvmppc_xive_rearm_escalation(struct kvm_vcpu *vcpu) { }

static inline bool kvmppc_xive_rearm_escalation(struct kvm_vcpu *vcpu) { return true; }





static inline int kvmppc_xive_enabled(struct kvm_vcpu *vcpu)

static inline int kvmppc_xive_enabled(struct kvm_vcpu *vcpu)

	{ return 0; }

	{ return 0; }
@@ -789,13 +787,6 @@ long kvmppc_rm_h_page_init(struct kvm_vcpu *vcpu, unsigned long flags, 
			   unsigned long dest, unsigned long src);

			   unsigned long dest, unsigned long src);

long kvmppc_hpte_hv_fault(struct kvm_vcpu *vcpu, unsigned long addr,

long kvmppc_hpte_hv_fault(struct kvm_vcpu *vcpu, unsigned long addr,

                          unsigned long slb_v, unsigned int status, bool data);

                          unsigned long slb_v, unsigned int status, bool data);

unsigned long kvmppc_rm_h_xirr(struct kvm_vcpu *vcpu);

unsigned long kvmppc_rm_h_xirr_x(struct kvm_vcpu *vcpu);

unsigned long kvmppc_rm_h_ipoll(struct kvm_vcpu *vcpu, unsigned long server);

int kvmppc_rm_h_ipi(struct kvm_vcpu *vcpu, unsigned long server,

                    unsigned long mfrr);

int kvmppc_rm_h_cppr(struct kvm_vcpu *vcpu, unsigned long cppr);

int kvmppc_rm_h_eoi(struct kvm_vcpu *vcpu, unsigned long xirr);

void kvmppc_guest_entry_inject_int(struct kvm_vcpu *vcpu);

void kvmppc_guest_entry_inject_int(struct kvm_vcpu *vcpu);





/*

/*
@@ -877,7 +868,6 @@ int kvm_vcpu_ioctl_dirty_tlb(struct kvm_vcpu *vcpu, 
			     struct kvm_dirty_tlb *cfg);

			     struct kvm_dirty_tlb *cfg);





long kvmppc_alloc_lpid(void);

long kvmppc_alloc_lpid(void);

void kvmppc_claim_lpid(long lpid);

void kvmppc_free_lpid(long lpid);

void kvmppc_free_lpid(long lpid);

void kvmppc_init_lpid(unsigned long nr_lpids);

void kvmppc_init_lpid(unsigned long nr_lpids);

arch/powerpc/include/asm/mmu_context.h

+0 −5
Original line number Original line Diff line number Diff line
@@ -34,15 +34,10 @@ extern void mm_iommu_init(struct mm_struct *mm); 
extern void mm_iommu_cleanup(struct mm_struct *mm);

extern void mm_iommu_cleanup(struct mm_struct *mm);

extern struct mm_iommu_table_group_mem_t *mm_iommu_lookup(struct mm_struct *mm,

extern struct mm_iommu_table_group_mem_t *mm_iommu_lookup(struct mm_struct *mm,

		unsigned long ua, unsigned long size);

		unsigned long ua, unsigned long size);

extern struct mm_iommu_table_group_mem_t *mm_iommu_lookup_rm(

		struct mm_struct *mm, unsigned long ua, unsigned long size);

extern struct mm_iommu_table_group_mem_t *mm_iommu_get(struct mm_struct *mm,

extern struct mm_iommu_table_group_mem_t *mm_iommu_get(struct mm_struct *mm,

		unsigned long ua, unsigned long entries);

		unsigned long ua, unsigned long entries);

extern long mm_iommu_ua_to_hpa(struct mm_iommu_table_group_mem_t *mem,

extern long mm_iommu_ua_to_hpa(struct mm_iommu_table_group_mem_t *mem,

		unsigned long ua, unsigned int pageshift, unsigned long *hpa);

		unsigned long ua, unsigned int pageshift, unsigned long *hpa);

extern long mm_iommu_ua_to_hpa_rm(struct mm_iommu_table_group_mem_t *mem,

		unsigned long ua, unsigned int pageshift, unsigned long *hpa);

extern void mm_iommu_ua_mark_dirty_rm(struct mm_struct *mm, unsigned long ua);

extern bool mm_iommu_is_devmem(struct mm_struct *mm, unsigned long hpa,

extern bool mm_iommu_is_devmem(struct mm_struct *mm, unsigned long hpa,

		unsigned int pageshift, unsigned long *size);

		unsigned int pageshift, unsigned long *size);

extern long mm_iommu_mapped_inc(struct mm_iommu_table_group_mem_t *mem);

extern long mm_iommu_mapped_inc(struct mm_iommu_table_group_mem_t *mem);