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

Commit 7227fc06 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge branch 'kvm-ppchv-next' of... 

Merge branch 'kvm-ppchv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into kvm-next
parents 6acdb160 72cde5a8

arch/powerpc/include/asm/kvm_book3s.h

+5 −0
Original line number Diff line number Diff line
@@ -304,6 +304,11 @@ static inline ulong kvmppc_get_fault_dar(struct kvm_vcpu *vcpu) 
	return vcpu->arch.fault_dar;

}



static inline bool is_kvmppc_resume_guest(int r)

{

	return (r == RESUME_GUEST || r == RESUME_GUEST_NV);

}



/* Magic register values loaded into r3 and r4 before the 'sc' assembly

 * instruction for the OSI hypercalls */

#define OSI_SC_MAGIC_R3			0x113724FA

arch/powerpc/include/asm/kvm_book3s_64.h

+12 −0
Original line number Diff line number Diff line
@@ -289,6 +289,18 @@ static inline void note_hpte_modification(struct kvm *kvm, 
	if (atomic_read(&kvm->arch.hpte_mod_interest))

		rev->guest_rpte |= HPTE_GR_MODIFIED;

}



/*

 * Like kvm_memslots(), but for use in real mode when we can't do

 * any RCU stuff (since the secondary threads are offline from the

 * kernel's point of view), and we can't print anything.

 * Thus we use rcu_dereference_raw() rather than rcu_dereference_check().

 */

static inline struct kvm_memslots *kvm_memslots_raw(struct kvm *kvm)

{

	return rcu_dereference_raw_notrace(kvm->memslots);

}



#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
@@ -94,7 +94,7 @@ struct kvmppc_host_state { 
	unsigned long xics_phys;

	u32 saved_xirr;

	u64 dabr;

	u64 host_mmcr[3];

	u64 host_mmcr[7];	/* MMCR 0,1,A, SIAR, SDAR, MMCR2, SIER */

	u32 host_pmc[8];

	u64 host_purr;

	u64 host_spurr;

arch/powerpc/include/asm/kvm_ppc.h

+2 −0
Original line number Diff line number Diff line
@@ -129,6 +129,8 @@ extern long kvm_vm_ioctl_create_spapr_tce(struct kvm *kvm, 
				struct kvm_create_spapr_tce *args);

extern long kvmppc_h_put_tce(struct kvm_vcpu *vcpu, unsigned long liobn,

			     unsigned long ioba, unsigned long tce);

extern long kvmppc_h_get_tce(struct kvm_vcpu *vcpu, unsigned long liobn,

			     unsigned long ioba);

extern struct kvm_rma_info *kvm_alloc_rma(void);

extern void kvm_release_rma(struct kvm_rma_info *ri);

extern struct page *kvm_alloc_hpt(unsigned long nr_pages);

arch/powerpc/include/asm/reg.h

+1 −0
Original line number Diff line number Diff line
@@ -213,6 +213,7 @@ 
#define SPRN_ACOP	0x1F	/* Available Coprocessor Register */

#define SPRN_TFIAR	0x81	/* Transaction Failure Inst Addr   */

#define SPRN_TEXASR	0x82	/* Transaction EXception & Summary */

#define   TEXASR_FS	__MASK(63-36)	/* Transaction Failure Summary */

#define SPRN_TEXASRU	0x83	/* ''	   ''	   ''	 Upper 32  */

#define SPRN_TFHAR	0x80	/* Transaction Failure Handler Addr */

#define SPRN_CTRLF	0x088