Commit 7b11dc99 authored by Scott Wood's avatar Scott Wood Committed by Avi Kivity
Browse files

KVM: PPC: e500: Fix TLBnCFG in KVM_CONFIG_TLB 



The associativity, not just total size, can differ from the host
hardware.

Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent e371f713

arch/powerpc/kvm/e500_tlb.c

+14 −5
Original line number Diff line number Diff line
@@ -1227,12 +1227,14 @@ int kvm_vcpu_ioctl_config_tlb(struct kvm_vcpu *vcpu, 
	vcpu_e500->gtlb_offset[0] = 0;

	vcpu_e500->gtlb_offset[1] = params.tlb_sizes[0];



	vcpu_e500->tlb0cfg = mfspr(SPRN_TLB0CFG) & ~0xfffUL;

	vcpu_e500->tlb0cfg &= ~(TLBnCFG_N_ENTRY | TLBnCFG_ASSOC);

	if (params.tlb_sizes[0] <= 2048)

		vcpu_e500->tlb0cfg |= params.tlb_sizes[0];

	vcpu_e500->tlb0cfg |= params.tlb_ways[0] << TLBnCFG_ASSOC_SHIFT;



	vcpu_e500->tlb1cfg = mfspr(SPRN_TLB1CFG) & ~0xfffUL;

	vcpu_e500->tlb1cfg &= ~(TLBnCFG_N_ENTRY | TLBnCFG_ASSOC);

	vcpu_e500->tlb1cfg |= params.tlb_sizes[1];

	vcpu_e500->tlb1cfg |= params.tlb_ways[1] << TLBnCFG_ASSOC_SHIFT;



	vcpu_e500->shared_tlb_pages = pages;

	vcpu_e500->num_shared_tlb_pages = num_pages;
@@ -1348,10 +1350,17 @@ int kvmppc_e500_tlb_init(struct kvmppc_vcpu_e500 *vcpu_e500) 
		goto err;



	/* Init TLB configuration register */

	vcpu_e500->tlb0cfg = mfspr(SPRN_TLB0CFG) & ~0xfffUL;

	vcpu_e500->tlb0cfg = mfspr(SPRN_TLB0CFG) &

			     ~(TLBnCFG_N_ENTRY | TLBnCFG_ASSOC);

	vcpu_e500->tlb0cfg |= vcpu_e500->gtlb_params[0].entries;

	vcpu_e500->tlb1cfg = mfspr(SPRN_TLB1CFG) & ~0xfffUL;

	vcpu_e500->tlb1cfg |= vcpu_e500->gtlb_params[1].entries;

	vcpu_e500->tlb0cfg |=

		vcpu_e500->gtlb_params[0].ways << TLBnCFG_ASSOC_SHIFT;



	vcpu_e500->tlb1cfg = mfspr(SPRN_TLB1CFG) &

			     ~(TLBnCFG_N_ENTRY | TLBnCFG_ASSOC);

	vcpu_e500->tlb0cfg |= vcpu_e500->gtlb_params[1].entries;

	vcpu_e500->tlb0cfg |=

		vcpu_e500->gtlb_params[1].ways << TLBnCFG_ASSOC_SHIFT;



	return 0;