Commit bb3a8a17 authored by Hollis Blanchard's avatar Hollis Blanchard Committed by Avi Kivity
Browse files

KVM: ppc: Add extra E500 exceptions 



e500 has additional interrupt vectors (and corresponding IVORs) for SPE and
performance monitoring interrupts.

Signed-off-by: default avatarLiu Yu <yu.liu@freescale.com>
Signed-off-by: default avatarHollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent bdc89f13

arch/powerpc/include/asm/kvm_asm.h

+6 −1
Original line number Diff line number Diff line
@@ -42,7 +42,12 @@ 
#define BOOKE_INTERRUPT_DTLB_MISS 13

#define BOOKE_INTERRUPT_ITLB_MISS 14

#define BOOKE_INTERRUPT_DEBUG 15

#define BOOKE_MAX_INTERRUPT 15



/* E500 */

#define BOOKE_INTERRUPT_SPE_UNAVAIL 32

#define BOOKE_INTERRUPT_SPE_FP_DATA 33

#define BOOKE_INTERRUPT_SPE_FP_ROUND 34

#define BOOKE_INTERRUPT_PERFORMANCE_MONITOR 35



#define RESUME_FLAG_NV          (1<<0)  /* Reload guest nonvolatile state? */

#define RESUME_FLAG_HOST        (1<<1)  /* Resume host? */

arch/powerpc/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ struct kvm_vcpu_arch { 
	u32 tbu;

	u32 tcr;

	u32 tsr;

	u32 ivor[16];

	u32 ivor[64];

	ulong ivpr;

	u32 pir;

arch/powerpc/kvm/booke.c

+18 −0
Original line number Diff line number Diff line
@@ -118,6 +118,9 @@ static int kvmppc_booke_irqprio_deliver(struct kvm_vcpu *vcpu, 
	case BOOKE_IRQPRIO_DATA_STORAGE:

	case BOOKE_IRQPRIO_INST_STORAGE:

	case BOOKE_IRQPRIO_FP_UNAVAIL:

	case BOOKE_IRQPRIO_SPE_UNAVAIL:

	case BOOKE_IRQPRIO_SPE_FP_DATA:

	case BOOKE_IRQPRIO_SPE_FP_ROUND:

	case BOOKE_IRQPRIO_AP_UNAVAIL:

	case BOOKE_IRQPRIO_ALIGNMENT:

		allowed = 1;
@@ -261,6 +264,21 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu, 
		r = RESUME_GUEST;

		break;



	case BOOKE_INTERRUPT_SPE_UNAVAIL:

		kvmppc_booke_queue_irqprio(vcpu, BOOKE_IRQPRIO_SPE_UNAVAIL);

		r = RESUME_GUEST;

		break;



	case BOOKE_INTERRUPT_SPE_FP_DATA:

		kvmppc_booke_queue_irqprio(vcpu, BOOKE_IRQPRIO_SPE_FP_DATA);

		r = RESUME_GUEST;

		break;



	case BOOKE_INTERRUPT_SPE_FP_ROUND:

		kvmppc_booke_queue_irqprio(vcpu, BOOKE_IRQPRIO_SPE_FP_ROUND);

		r = RESUME_GUEST;

		break;



	case BOOKE_INTERRUPT_DATA_STORAGE:

		vcpu->arch.dear = vcpu->arch.fault_dear;

		vcpu->arch.esr = vcpu->arch.fault_esr;

arch/powerpc/kvm/booke.h

+18 −12
Original line number Diff line number Diff line
@@ -31,18 +31,24 @@ 
#define BOOKE_IRQPRIO_ALIGNMENT 2

#define BOOKE_IRQPRIO_PROGRAM 3

#define BOOKE_IRQPRIO_FP_UNAVAIL 4

#define BOOKE_IRQPRIO_SYSCALL 5

#define BOOKE_IRQPRIO_AP_UNAVAIL 6

#define BOOKE_IRQPRIO_DTLB_MISS 7

#define BOOKE_IRQPRIO_ITLB_MISS 8

#define BOOKE_IRQPRIO_MACHINE_CHECK 9

#define BOOKE_IRQPRIO_DEBUG 10

#define BOOKE_IRQPRIO_CRITICAL 11

#define BOOKE_IRQPRIO_WATCHDOG 12

#define BOOKE_IRQPRIO_EXTERNAL 13

#define BOOKE_IRQPRIO_FIT 14

#define BOOKE_IRQPRIO_DECREMENTER 15

#define BOOKE_IRQPRIO_MAX 15

#define BOOKE_IRQPRIO_SPE_UNAVAIL 5

#define BOOKE_IRQPRIO_SPE_FP_DATA 6

#define BOOKE_IRQPRIO_SPE_FP_ROUND 7

#define BOOKE_IRQPRIO_SYSCALL 8

#define BOOKE_IRQPRIO_AP_UNAVAIL 9

#define BOOKE_IRQPRIO_DTLB_MISS 10

#define BOOKE_IRQPRIO_ITLB_MISS 11

#define BOOKE_IRQPRIO_MACHINE_CHECK 12

#define BOOKE_IRQPRIO_DEBUG 13

#define BOOKE_IRQPRIO_CRITICAL 14

#define BOOKE_IRQPRIO_WATCHDOG 15

#define BOOKE_IRQPRIO_EXTERNAL 16

#define BOOKE_IRQPRIO_FIT 17

#define BOOKE_IRQPRIO_DECREMENTER 18

#define BOOKE_IRQPRIO_PERFORMANCE_MONITOR 19

#define BOOKE_IRQPRIO_MAX 19



extern unsigned long kvmppc_booke_handlers;



/* Helper function for "full" MSR writes. No need to call this if only EE is

 * changing. */

arch/powerpc/kvm/booke_interrupts.S

+3 −0
Original line number Diff line number Diff line
@@ -86,6 +86,9 @@ KVM_HANDLER BOOKE_INTERRUPT_WATCHDOG 
KVM_HANDLER BOOKE_INTERRUPT_DTLB_MISS

KVM_HANDLER BOOKE_INTERRUPT_ITLB_MISS

KVM_HANDLER BOOKE_INTERRUPT_DEBUG

KVM_HANDLER BOOKE_INTERRUPT_SPE_UNAVAIL

KVM_HANDLER BOOKE_INTERRUPT_SPE_FP_DATA

KVM_HANDLER BOOKE_INTERRUPT_SPE_FP_ROUND



_GLOBAL(kvmppc_handler_len)

	.long kvmppc_handler_1 - kvmppc_handler_0