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

Commit 00c027db authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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

Patch queue for ppc - 2014-09-24

New awesome things in this release:

  - E500: e6500 core support
  - E500: guest and remote debug support
  - Book3S: remote sw breakpoint support
  - Book3S: HV: Minor bugfixes

Alexander Graf (1):
      KVM: PPC: Pass enum to kvmppc_get_last_inst

Bharat Bhushan (8):
      KVM: PPC: BOOKE: allow debug interrupt at "debug level"
      KVM: PPC: BOOKE : Emulate rfdi instruction
      KVM: PPC: BOOKE: Allow guest to change MSR_DE
      KVM: PPC: BOOKE: Clear guest dbsr in userspace exit KVM_EXIT_DEBUG
      KVM: PPC: BOOKE: Guest and hardware visible debug registers are same
      KVM: PPC: BOOKE: Add one reg interface for DBSR
      KVM: PPC: BOOKE: Add one_reg documentation of SPRG9 and DBSR
      KVM: PPC: BOOKE: Emulate debug registers and exception

Madhavan Srinivasan (2):
      powerpc/kvm: support to handle sw breakpoint
      powerpc/kvm: common sw breakpoint instr across ppc

Michael Neuling (1):
      KVM: PPC: Book3S HV: Add register name when loading toc

Mihai Caraman (10):
      powerpc/booke: Restrict SPE exception handlers to e200/e500 cores
      powerpc/booke: Revert SPE/AltiVec common defines for interrupt numbers
      KVM: PPC: Book3E: Increase FPU laziness
      KVM: PPC: Book3e: Add AltiVec support
      KVM: PPC: Make ONE_REG powerpc generic
      KVM: PPC: Move ONE_REG AltiVec support to powerpc
      KVM: PPC: Remove the tasklet used by the hrtimer
      KVM: PPC: Remove shared defines for SPE and AltiVec interrupts
      KVM: PPC: e500mc: Add support for single threaded vcpus on e6500 core
      KVM: PPC: Book3E: Enable e6500 core

Paul Mackerras (2):
      KVM: PPC: Book3S HV: Increase timeout for grabbing secondary threads
      KVM: PPC: Book3S HV: Only accept host PVR value for guest PVR
parents c24ae0dc 8d0eff63

Documentation/virtual/kvm/api.txt

+2 −0
Original line number Diff line number Diff line
@@ -1901,6 +1901,8 @@ registers, find a list below: 
  PPC   | KVM_REG_PPC_ARCH_COMPAT       | 32

  PPC   | KVM_REG_PPC_DABRX             | 32

  PPC   | KVM_REG_PPC_WORT              | 64

  PPC	| KVM_REG_PPC_SPRG9             | 64

  PPC	| KVM_REG_PPC_DBSR              | 32

  PPC   | KVM_REG_PPC_TM_GPR0           | 64

          ...

  PPC   | KVM_REG_PPC_TM_GPR31          | 64

arch/powerpc/include/asm/kvm_asm.h

+10 −10
Original line number Diff line number Diff line
@@ -53,17 +53,17 @@ 
#define BOOKE_INTERRUPT_DEBUG 15



/* E500 */

#define BOOKE_INTERRUPT_SPE_ALTIVEC_UNAVAIL 32

#define BOOKE_INTERRUPT_SPE_FP_DATA_ALTIVEC_ASSIST 33

/*

 * TODO: Unify 32-bit and 64-bit kernel exception handlers to use same defines

 */

#define BOOKE_INTERRUPT_SPE_UNAVAIL BOOKE_INTERRUPT_SPE_ALTIVEC_UNAVAIL

#define BOOKE_INTERRUPT_SPE_FP_DATA BOOKE_INTERRUPT_SPE_FP_DATA_ALTIVEC_ASSIST

#define BOOKE_INTERRUPT_ALTIVEC_UNAVAIL BOOKE_INTERRUPT_SPE_ALTIVEC_UNAVAIL

#define BOOKE_INTERRUPT_ALTIVEC_ASSIST \

				BOOKE_INTERRUPT_SPE_FP_DATA_ALTIVEC_ASSIST

#ifdef CONFIG_SPE_POSSIBLE

#define BOOKE_INTERRUPT_SPE_UNAVAIL 32

#define BOOKE_INTERRUPT_SPE_FP_DATA 33

#define BOOKE_INTERRUPT_SPE_FP_ROUND 34

#endif



#ifdef CONFIG_PPC_E500MC

#define BOOKE_INTERRUPT_ALTIVEC_UNAVAIL 32

#define BOOKE_INTERRUPT_ALTIVEC_ASSIST 33

#endif



#define BOOKE_INTERRUPT_PERFORMANCE_MONITOR 35

#define BOOKE_INTERRUPT_DOORBELL 36

#define BOOKE_INTERRUPT_DOORBELL_CRITICAL 37

arch/powerpc/include/asm/kvm_booke.h

+4 −3
Original line number Diff line number Diff line
@@ -23,15 +23,16 @@ 
#include <linux/types.h>

#include <linux/kvm_host.h>



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

/*

 * Number of available lpids. Only the low-order 6 bits of LPID rgister are

 * implemented on e500mc+ cores.

 */

#define KVMPPC_NR_LPIDS                        64



#define KVMPPC_INST_EHPRIV		0x7c00021c

#define EHPRIV_OC_SHIFT			11

/* "ehpriv 1" : ehpriv with OC = 1 is used for debug emulation */

#define EHPRIV_OC_DEBUG			1

#define KVMPPC_INST_EHPRIV_DEBUG	(KVMPPC_INST_EHPRIV | \

					 (EHPRIV_OC_DEBUG << EHPRIV_OC_SHIFT))



static inline void kvmppc_set_gpr(struct kvm_vcpu *vcpu, int num, ulong val)

{

arch/powerpc/include/asm/kvm_host.h

+1 −3
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ enum kvm_exit_types { 
	EMULATED_TLBWE_EXITS,

	EMULATED_RFI_EXITS,

	EMULATED_RFCI_EXITS,

	EMULATED_RFDI_EXITS,

	DEC_EXITS,

	EXT_INTR_EXITS,

	HALT_WAKEUP,
@@ -589,8 +590,6 @@ struct kvm_vcpu_arch { 
	u32 crit_save;

	/* guest debug registers*/

	struct debug_reg dbg_reg;

	/* hardware visible debug registers when in guest state */

	struct debug_reg shadow_dbg_reg;

#endif

	gpa_t paddr_accessed;

	gva_t vaddr_accessed;
@@ -612,7 +611,6 @@ struct kvm_vcpu_arch { 
	u32 cpr0_cfgaddr; /* holds the last set cpr0_cfgaddr */



	struct hrtimer dec_timer;

	struct tasklet_struct tasklet;

	u64 dec_jiffies;

	u64 dec_expires;

	unsigned long pending_exceptions;

arch/powerpc/include/asm/kvm_ppc.h

+10 −1
Original line number Diff line number Diff line
@@ -38,6 +38,12 @@ 
#include <asm/paca.h>

#endif



/*

 * KVMPPC_INST_SW_BREAKPOINT is debug Instruction

 * for supporting software breakpoint.

 */

#define KVMPPC_INST_SW_BREAKPOINT	0x00dddd00



enum emulation_result {

	EMULATE_DONE,         /* no further processing */

	EMULATE_DO_MMIO,      /* kvm_run filled with MMIO request */
@@ -89,7 +95,7 @@ extern int kvmppc_emulate_loadstore(struct kvm_vcpu *vcpu); 
extern int kvmppc_emulate_mmio(struct kvm_run *run, struct kvm_vcpu *vcpu);

extern void kvmppc_emulate_dec(struct kvm_vcpu *vcpu);

extern u32 kvmppc_get_dec(struct kvm_vcpu *vcpu, u64 tb);

extern void kvmppc_decrementer_func(unsigned long data);

extern void kvmppc_decrementer_func(struct kvm_vcpu *vcpu);

extern int kvmppc_sanity_check(struct kvm_vcpu *vcpu);

extern int kvmppc_subarch_vcpu_init(struct kvm_vcpu *vcpu);

extern void kvmppc_subarch_vcpu_uninit(struct kvm_vcpu *vcpu);
@@ -206,6 +212,9 @@ extern int kvmppc_xics_get_xive(struct kvm *kvm, u32 irq, u32 *server, 
extern int kvmppc_xics_int_on(struct kvm *kvm, u32 irq);

extern int kvmppc_xics_int_off(struct kvm *kvm, u32 irq);



void kvmppc_core_dequeue_debug(struct kvm_vcpu *vcpu);

void kvmppc_core_queue_debug(struct kvm_vcpu *vcpu);



union kvmppc_one_reg {

	u32	wval;

	u64	dval;