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

Commit 8893a188 authored by Mihai Caraman's avatar Mihai Caraman Committed by Alexander Graf
Browse files

KVM: PPC: e500: Move vcpu's MMU configuration to dedicated functions 



Vcpu's MMU default configuration and geometry update logic was buried in
a chunk of code. Move them to dedicated functions to add more clarity.

Signed-off-by: default avatarMihai Caraman <mihai.caraman@freescale.com>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent a85d2aa2

arch/powerpc/kvm/e500_mmu.c

+38 −22
Original line number Diff line number Diff line
@@ -690,6 +690,20 @@ int kvmppc_set_one_reg_e500_tlb(struct kvm_vcpu *vcpu, u64 id, 
	return r;

}



static int vcpu_mmu_geometry_update(struct kvm_vcpu *vcpu,

		struct kvm_book3e_206_tlb_params *params)

{

	vcpu->arch.tlbcfg[0] &= ~(TLBnCFG_N_ENTRY | TLBnCFG_ASSOC);

	if (params->tlb_sizes[0] <= 2048)

		vcpu->arch.tlbcfg[0] |= params->tlb_sizes[0];

	vcpu->arch.tlbcfg[0] |= params->tlb_ways[0] << TLBnCFG_ASSOC_SHIFT;



	vcpu->arch.tlbcfg[1] &= ~(TLBnCFG_N_ENTRY | TLBnCFG_ASSOC);

	vcpu->arch.tlbcfg[1] |= params->tlb_sizes[1];

	vcpu->arch.tlbcfg[1] |= params->tlb_ways[1] << TLBnCFG_ASSOC_SHIFT;

	return 0;

}



int kvm_vcpu_ioctl_config_tlb(struct kvm_vcpu *vcpu,

			      struct kvm_config_tlb *cfg)

{
@@ -786,16 +800,8 @@ 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->arch.mmucfg = mfspr(SPRN_MMUCFG) & ~MMUCFG_LPIDSIZE;



	vcpu->arch.tlbcfg[0] &= ~(TLBnCFG_N_ENTRY | TLBnCFG_ASSOC);

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

		vcpu->arch.tlbcfg[0] |= params.tlb_sizes[0];

	vcpu->arch.tlbcfg[0] |= params.tlb_ways[0] << TLBnCFG_ASSOC_SHIFT;



	vcpu->arch.tlbcfg[1] &= ~(TLBnCFG_N_ENTRY | TLBnCFG_ASSOC);

	vcpu->arch.tlbcfg[1] |= params.tlb_sizes[1];

	vcpu->arch.tlbcfg[1] |= params.tlb_ways[1] << TLBnCFG_ASSOC_SHIFT;

	/* Update vcpu's MMU geometry based on SW_TLB input */

	vcpu_mmu_geometry_update(vcpu, &params);



	vcpu_e500->shared_tlb_pages = pages;

	vcpu_e500->num_shared_tlb_pages = num_pages;
@@ -831,6 +837,27 @@ int kvm_vcpu_ioctl_dirty_tlb(struct kvm_vcpu *vcpu, 
	return 0;

}



/* Vcpu's MMU default configuration */

static int vcpu_mmu_init(struct kvm_vcpu *vcpu,

		       struct kvmppc_e500_tlb_params *params)

{

	/* Initialize RASIZE, PIDSIZE, NTLBS and MAVN fields with host values*/

	vcpu->arch.mmucfg = mfspr(SPRN_MMUCFG) & ~MMUCFG_LPIDSIZE;



	/* Initialize TLBnCFG fields with host values and SW_TLB geometry*/

	vcpu->arch.tlbcfg[0] = mfspr(SPRN_TLB0CFG) &

			     ~(TLBnCFG_N_ENTRY | TLBnCFG_ASSOC);

	vcpu->arch.tlbcfg[0] |= params[0].entries;

	vcpu->arch.tlbcfg[0] |= params[0].ways << TLBnCFG_ASSOC_SHIFT;



	vcpu->arch.tlbcfg[1] = mfspr(SPRN_TLB1CFG) &

			     ~(TLBnCFG_N_ENTRY | TLBnCFG_ASSOC);

	vcpu->arch.tlbcfg[1] |= params[1].entries;

	vcpu->arch.tlbcfg[1] |= params[1].ways << TLBnCFG_ASSOC_SHIFT;



	return 0;

}



int kvmppc_e500_tlb_init(struct kvmppc_vcpu_e500 *vcpu_e500)

{

	struct kvm_vcpu *vcpu = &vcpu_e500->vcpu;
@@ -875,18 +902,7 @@ int kvmppc_e500_tlb_init(struct kvmppc_vcpu_e500 *vcpu_e500) 
	if (!vcpu_e500->g2h_tlb1_map)

		goto err;



	/* Init TLB configuration register */

	vcpu->arch.tlbcfg[0] = mfspr(SPRN_TLB0CFG) &

			     ~(TLBnCFG_N_ENTRY | TLBnCFG_ASSOC);

	vcpu->arch.tlbcfg[0] |= vcpu_e500->gtlb_params[0].entries;

	vcpu->arch.tlbcfg[0] |=

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



	vcpu->arch.tlbcfg[1] = mfspr(SPRN_TLB1CFG) &

			     ~(TLBnCFG_N_ENTRY | TLBnCFG_ASSOC);

	vcpu->arch.tlbcfg[1] |= vcpu_e500->gtlb_params[1].entries;

	vcpu->arch.tlbcfg[1] |=

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

	vcpu_mmu_init(vcpu, vcpu_e500->gtlb_params);



	kvmppc_recalc_tlb1map_range(vcpu_e500);

	return 0;