Commit 9d67121a authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next 



This merges in the "ppc-kvm" topic branch of the powerpc tree to get a
series of commits that touch both general arch/powerpc code and KVM
code.  These commits will be merged both via the KVM tree and the
powerpc tree.

Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
parents aa227864 83a05510

Documentation/virtual/kvm/api.txt

+1 −0
Original line number Diff line number Diff line
@@ -1922,6 +1922,7 @@ registers, find a list below: 
  PPC   | KVM_REG_PPC_TIDR              | 64

  PPC   | KVM_REG_PPC_PSSCR             | 64

  PPC   | KVM_REG_PPC_DEC_EXPIRY        | 64

  PPC   | KVM_REG_PPC_PTCR              | 64

  PPC   | KVM_REG_PPC_TM_GPR0           | 64

          ...

  PPC   | KVM_REG_PPC_TM_GPR31          | 64

arch/powerpc/include/asm/asm-prototypes.h

+21 −0
Original line number Diff line number Diff line
@@ -150,4 +150,25 @@ extern s32 patch__memset_nocache, patch__memcpy_nocache; 


extern long flush_count_cache;



#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

void kvmppc_save_tm_hv(struct kvm_vcpu *vcpu, u64 msr, bool preserve_nv);

void kvmppc_restore_tm_hv(struct kvm_vcpu *vcpu, u64 msr, bool preserve_nv);

#else

static inline void kvmppc_save_tm_hv(struct kvm_vcpu *vcpu, u64 msr,

				     bool preserve_nv) { }

static inline void kvmppc_restore_tm_hv(struct kvm_vcpu *vcpu, u64 msr,

					bool preserve_nv) { }

#endif /* CONFIG_PPC_TRANSACTIONAL_MEM */



void kvmhv_save_host_pmu(void);

void kvmhv_load_host_pmu(void);

void kvmhv_save_guest_pmu(struct kvm_vcpu *vcpu, bool pmu_in_use);

void kvmhv_load_guest_pmu(struct kvm_vcpu *vcpu);



int __kvmhv_vcpu_entry_p9(struct kvm_vcpu *vcpu);



long kvmppc_h_set_dabr(struct kvm_vcpu *vcpu, unsigned long dabr);

long kvmppc_h_set_xdabr(struct kvm_vcpu *vcpu, unsigned long dabr,

			unsigned long dabrx);



#endif /* _ASM_POWERPC_ASM_PROTOTYPES_H */

arch/powerpc/include/asm/book3s/64/mmu-hash.h

+12 −0
Original line number Diff line number Diff line
@@ -203,6 +203,18 @@ static inline unsigned int mmu_psize_to_shift(unsigned int mmu_psize) 
	BUG();

}



static inline unsigned int ap_to_shift(unsigned long ap)

{

	int psize;



	for (psize = 0; psize < MMU_PAGE_COUNT; psize++) {

		if (mmu_psize_defs[psize].ap == ap)

			return mmu_psize_defs[psize].shift;

	}



	return -1;

}



static inline unsigned long get_sllp_encoding(int psize)

{

	unsigned long sllp;

arch/powerpc/include/asm/book3s/64/tlbflush-radix.h

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ extern void radix__flush_tlb_lpid_page(unsigned int lpid, 
					unsigned long addr,

					unsigned long page_size);

extern void radix__flush_pwc_lpid(unsigned int lpid);

extern void radix__flush_tlb_lpid(unsigned int lpid);

extern void radix__local_flush_tlb_lpid(unsigned int lpid);

extern void radix__local_flush_tlb_lpid_guest(unsigned int lpid);

arch/powerpc/include/asm/hvcall.h

+41 −0
Original line number Diff line number Diff line
@@ -322,6 +322,11 @@ 
#define H_GET_24X7_DATA		0xF07C

#define H_GET_PERF_COUNTER_INFO	0xF080



/* Platform-specific hcalls used for nested HV KVM */

#define H_SET_PARTITION_TABLE	0xF800

#define H_ENTER_NESTED		0xF804

#define H_TLB_INVALIDATE	0xF808



/* Values for 2nd argument to H_SET_MODE */

#define H_SET_MODE_RESOURCE_SET_CIABR		1

#define H_SET_MODE_RESOURCE_SET_DAWR		2
@@ -461,6 +466,42 @@ struct h_cpu_char_result { 
	u64 behaviour;

};



/* Register state for entering a nested guest with H_ENTER_NESTED */

struct hv_guest_state {

	u64 version;		/* version of this structure layout */

	u32 lpid;

	u32 vcpu_token;

	/* These registers are hypervisor privileged (at least for writing) */

	u64 lpcr;

	u64 pcr;

	u64 amor;

	u64 dpdes;

	u64 hfscr;

	s64 tb_offset;

	u64 dawr0;

	u64 dawrx0;

	u64 ciabr;

	u64 hdec_expiry;

	u64 purr;

	u64 spurr;

	u64 ic;

	u64 vtb;

	u64 hdar;

	u64 hdsisr;

	u64 heir;

	u64 asdr;

	/* These are OS privileged but need to be set late in guest entry */

	u64 srr0;

	u64 srr1;

	u64 sprg[4];

	u64 pidr;

	u64 cfar;

	u64 ppr;

};



/* Latest version of hv_guest_state structure */

#define HV_GUEST_STATE_VERSION	1



#endif /* __ASSEMBLY__ */

#endif /* __KERNEL__ */

#endif /* _ASM_POWERPC_HVCALL_H */