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

Commit f05ed4d5 authored by Paul Mackerras's avatar Paul Mackerras Committed by Avi Kivity
Browse files

KVM: PPC: Split out code from book3s.c into book3s_pr.c 



In preparation for adding code to enable KVM to use hypervisor mode
on 64-bit Book 3S processors, this splits book3s.c into two files,
book3s.c and book3s_pr.c, where book3s_pr.c contains the code that is
specific to running the guest in problem state (user mode) and book3s.c
contains code which should apply to all Book 3S processors.

In doing this, we abstract some details, namely the interrupt offset,
updating the interrupt pending flag, and detecting if the guest is
in a critical section.  These are all things that will be different
when we use hypervisor mode.

Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent c4befc58

arch/powerpc/include/asm/kvm_book3s.h

+35 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ extern void kvmppc_mmu_pte_flush(struct kvm_vcpu *vcpu, ulong ea, ulong ea_mask) 
extern void kvmppc_mmu_pte_vflush(struct kvm_vcpu *vcpu, u64 vp, u64 vp_mask);

extern void kvmppc_mmu_pte_pflush(struct kvm_vcpu *vcpu, ulong pa_start, ulong pa_end);

extern void kvmppc_set_msr(struct kvm_vcpu *vcpu, u64 new_msr);

extern void kvmppc_set_pvr(struct kvm_vcpu *vcpu, u32 pvr);

extern void kvmppc_mmu_book3s_64_init(struct kvm_vcpu *vcpu);

extern void kvmppc_mmu_book3s_32_init(struct kvm_vcpu *vcpu);

extern int kvmppc_mmu_map_page(struct kvm_vcpu *vcpu, struct kvmppc_pte *pte);
@@ -150,6 +151,20 @@ static inline struct kvmppc_vcpu_book3s *to_book3s(struct kvm_vcpu *vcpu) 
	return container_of(vcpu, struct kvmppc_vcpu_book3s, vcpu);

}



static inline unsigned long kvmppc_interrupt_offset(struct kvm_vcpu *vcpu)

{

	return to_book3s(vcpu)->hior;

}



static inline void kvmppc_update_int_pending(struct kvm_vcpu *vcpu,

			unsigned long pending_now, unsigned long old_pending)

{

	if (pending_now)

		vcpu->arch.shared->int_pending = 1;

	else if (old_pending)

		vcpu->arch.shared->int_pending = 0;

}



static inline ulong dsisr(void)

{

	ulong r;
@@ -247,6 +262,26 @@ static inline ulong kvmppc_get_fault_dar(struct kvm_vcpu *vcpu) 
	return to_svcpu(vcpu)->fault_dar;

}



static inline bool kvmppc_critical_section(struct kvm_vcpu *vcpu)

{

	ulong crit_raw = vcpu->arch.shared->critical;

	ulong crit_r1 = kvmppc_get_gpr(vcpu, 1);

	bool crit;



	/* Truncate crit indicators in 32 bit mode */

	if (!(vcpu->arch.shared->msr & MSR_SF)) {

		crit_raw &= 0xffffffff;

		crit_r1 &= 0xffffffff;

	}



	/* Critical section when crit == r1 */

	crit = (crit_raw == crit_r1);

	/* ... and we're in supervisor mode */

	crit = crit && !(vcpu->arch.shared->msr & MSR_PR);



	return crit;

}



/* 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/kvm/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ kvm-book3s_64-objs := \ 
	fpu.o \

	book3s_paired_singles.o \

	book3s.o \

	book3s_pr.o \

	book3s_emulate.o \

	book3s_interrupts.o \

	book3s_mmu_hpte.o \
@@ -56,6 +57,7 @@ kvm-book3s_32-objs := \ 
	fpu.o \

	book3s_paired_singles.o \

	book3s.o \

	book3s_pr.o \

	book3s_emulate.o \

	book3s_interrupts.o \

	book3s_mmu_hpte.o \

arch/powerpc/kvm/book3s.c

+7 −988

File changed.

Preview size limit exceeded, changes collapsed.

arch/powerpc/kvm/book3s_pr.c

0 → 100644
+1009 −0

File added.

Preview size limit exceeded, changes collapsed.