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

Commit 6b2ba1a9 authored by Scott Wood's avatar Scott Wood Committed by Alexander Graf
Browse files

kvm/ppc/e500: h2g_tlb1_rmap: esel 0 is valid 



Add one to esel values in h2g_tlb1_rmap, so that "no mapping" can be
distinguished from "esel 0".  Note that we're not saved by the fact
that host esel 0 is reserved for non-KVM use, because KVM host esel
numbering is not the raw host numbering (see to_htlb1_esel).

Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent c5e6cb05

arch/powerpc/kvm/e500_mmu_host.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -511,10 +511,10 @@ static int kvmppc_e500_tlb1_map_tlb1(struct kvmppc_vcpu_e500 *vcpu_e500, 
	vcpu_e500->g2h_tlb1_map[esel] |= (u64)1 << sesel;

	vcpu_e500->g2h_tlb1_map[esel] |= (u64)1 << sesel;

	vcpu_e500->gtlb_priv[1][esel].ref.flags |= E500_TLB_BITMAP;

	vcpu_e500->gtlb_priv[1][esel].ref.flags |= E500_TLB_BITMAP;

	if (vcpu_e500->h2g_tlb1_rmap[sesel]) {

	if (vcpu_e500->h2g_tlb1_rmap[sesel]) {

		unsigned int idx = vcpu_e500->h2g_tlb1_rmap[sesel];

		unsigned int idx = vcpu_e500->h2g_tlb1_rmap[sesel] - 1;

		vcpu_e500->g2h_tlb1_map[idx] &= ~(1ULL << sesel);

		vcpu_e500->g2h_tlb1_map[idx] &= ~(1ULL << sesel);

	}

	}

	vcpu_e500->h2g_tlb1_rmap[sesel] = esel;

	vcpu_e500->h2g_tlb1_rmap[sesel] = esel + 1;





	return sesel;

	return sesel;

}

}