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

Commit b0a1835d authored by Liu Yu's avatar Liu Yu Committed by Avi Kivity
Browse files

KVM: ppc: Add emulation of E500 register mmucsr0 



Latest kernel flushes TLB via mmucsr0.

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

arch/powerpc/kvm/e500_emulate.c

+8 −0
Original line number Diff line number Diff line
@@ -105,6 +105,11 @@ int kvmppc_core_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, int rs) 
	case SPRN_HID1:

		vcpu_e500->hid1 = vcpu->arch.gpr[rs]; break;



	case SPRN_MMUCSR0:

		emulated = kvmppc_e500_emul_mt_mmucsr0(vcpu_e500,

				vcpu->arch.gpr[rs]);

		break;



	/* extra exceptions */

	case SPRN_IVOR32:

		vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_UNAVAIL] = vcpu->arch.gpr[rs];
@@ -172,6 +177,9 @@ int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt) 
	case SPRN_HID1:

		vcpu->arch.gpr[rt] = vcpu_e500->hid1; break;



	case SPRN_MMUCSR0:

		vcpu->arch.gpr[rt] = 0; break;



	/* extra exceptions */

	case SPRN_IVOR32:

		vcpu->arch.gpr[rt] = vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_UNAVAIL];

arch/powerpc/kvm/e500_tlb.c

+16 −0
Original line number Diff line number Diff line
@@ -391,6 +391,22 @@ static int kvmppc_e500_gtlbe_invalidate(struct kvmppc_vcpu_e500 *vcpu_e500, 
	return 0;

}



int kvmppc_e500_emul_mt_mmucsr0(struct kvmppc_vcpu_e500 *vcpu_e500, ulong value)

{

	int esel;



	if (value & MMUCSR0_TLB0FI)

		for (esel = 0; esel < vcpu_e500->guest_tlb_size[0]; esel++)

			kvmppc_e500_gtlbe_invalidate(vcpu_e500, 0, esel);

	if (value & MMUCSR0_TLB1FI)

		for (esel = 0; esel < vcpu_e500->guest_tlb_size[1]; esel++)

			kvmppc_e500_gtlbe_invalidate(vcpu_e500, 1, esel);



	_tlbil_all();



	return EMULATE_DONE;

}



int kvmppc_e500_emul_tlbivax(struct kvm_vcpu *vcpu, int ra, int rb)

{

	struct kvmppc_vcpu_e500 *vcpu_e500 = to_e500(vcpu);

arch/powerpc/kvm/e500_tlb.h

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
	   | E500_TLB_USER_PERM_MASK | E500_TLB_SUPER_PERM_MASK)



extern void kvmppc_dump_tlbs(struct kvm_vcpu *);

extern int kvmppc_e500_emul_mt_mmucsr0(struct kvmppc_vcpu_e500 *, ulong);

extern int kvmppc_e500_emul_tlbwe(struct kvm_vcpu *);

extern int kvmppc_e500_emul_tlbre(struct kvm_vcpu *);

extern int kvmppc_e500_emul_tlbivax(struct kvm_vcpu *, int, int);