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

Commit 9a6d77d5 authored by Gleb Natapov's avatar Gleb Natapov
Browse files

Merge 'git://github.com/agraf/linux-2.6.git kvm-ppc-next' into queue

parents 81f4f76b 4fe27d2a

Documentation/virtual/kvm/api.txt

+4 −0
Original line number Diff line number Diff line
@@ -1788,6 +1788,10 @@ registers, find a list below: 
  PPC   | KVM_REG_PPC_VPA_DTL   | 128

  PPC   | KVM_REG_PPC_EPCR	| 32

  PPC   | KVM_REG_PPC_EPR	| 32

  PPC   | KVM_REG_PPC_TCR	| 32

  PPC   | KVM_REG_PPC_TSR	| 32

  PPC   | KVM_REG_PPC_OR_TSR	| 32

  PPC   | KVM_REG_PPC_CLEAR_TSR	| 32



ARM registers are mapped using the lower 32 bits.  The upper 16 of that

is the register group type, or coprocessor number:

arch/powerpc/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -504,6 +504,7 @@ struct kvm_vcpu_arch { 
	u32 tlbcfg[4];

	u32 mmucfg;

	u32 epr;

	u32 crit_save;

	struct kvmppc_booke_debug_reg dbg_reg;

#endif

	gpa_t paddr_accessed;

arch/powerpc/include/asm/kvm_ppc.h

+1 −2
Original line number Diff line number Diff line
@@ -104,8 +104,7 @@ extern void kvmppc_core_queue_dec(struct kvm_vcpu *vcpu); 
extern void kvmppc_core_dequeue_dec(struct kvm_vcpu *vcpu);

extern void kvmppc_core_queue_external(struct kvm_vcpu *vcpu,

                                       struct kvm_interrupt *irq);

extern void kvmppc_core_dequeue_external(struct kvm_vcpu *vcpu,

                                         struct kvm_interrupt *irq);

extern void kvmppc_core_dequeue_external(struct kvm_vcpu *vcpu);

extern void kvmppc_core_flush_tlb(struct kvm_vcpu *vcpu);



extern int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,

arch/powerpc/include/uapi/asm/kvm.h

+5 −0
Original line number Diff line number Diff line
@@ -417,4 +417,9 @@ struct kvm_get_htab_header { 
#define KVM_REG_PPC_EPCR	(KVM_REG_PPC | KVM_REG_SIZE_U32 | 0x85)

#define KVM_REG_PPC_EPR		(KVM_REG_PPC | KVM_REG_SIZE_U32 | 0x86)



/* Timer Status Register OR/CLEAR interface */

#define KVM_REG_PPC_OR_TSR	(KVM_REG_PPC | KVM_REG_SIZE_U32 | 0x87)

#define KVM_REG_PPC_CLEAR_TSR	(KVM_REG_PPC | KVM_REG_SIZE_U32 | 0x88)

#define KVM_REG_PPC_TCR		(KVM_REG_PPC | KVM_REG_SIZE_U32 | 0x89)

#define KVM_REG_PPC_TSR		(KVM_REG_PPC | KVM_REG_SIZE_U32 | 0x8a)

#endif /* __LINUX_KVM_POWERPC_H */

arch/powerpc/kernel/asm-offsets.c

+1 −0
Original line number Diff line number Diff line
@@ -596,6 +596,7 @@ int main(void) 
	DEFINE(VCPU_LAST_INST, offsetof(struct kvm_vcpu, arch.last_inst));

	DEFINE(VCPU_FAULT_DEAR, offsetof(struct kvm_vcpu, arch.fault_dear));

	DEFINE(VCPU_FAULT_ESR, offsetof(struct kvm_vcpu, arch.fault_esr));

	DEFINE(VCPU_CRIT_SAVE, offsetof(struct kvm_vcpu, arch.crit_save));

#endif /* CONFIG_PPC_BOOK3S */

#endif /* CONFIG_KVM */