From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:39861) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ro9ZU-0006vP-Ln for qemu-devel@nongnu.org; Fri, 20 Jan 2012 03:11:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ro9ZP-0001nB-CV for qemu-devel@nongnu.org; Fri, 20 Jan 2012 03:11:40 -0500 Message-ID: <4F192141.6030107@suse.de> Date: Fri, 20 Jan 2012 09:09:37 +0100 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1327029449-13220-1-git-send-email-agraf@suse.de> <1327029449-13220-6-git-send-email-agraf@suse.de> In-Reply-To: <1327029449-13220-6-git-send-email-agraf@suse.de> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 5/6] PPC: booke206: Check for min/max TLB entry size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexander Graf Cc: Scott Wood , qemu-ppc@nongnu.org, qemu-devel Developers Am 20.01.2012 04:17, schrieb Alexander Graf: > When setting a TLB entry, we need to check if the TLB we're putting it = in > actually supports the given size. According to the 2.06 PowerPC ISA, a > value that's out of range results in the minimum page size for the TLB > to be used. >=20 > Signed-off-by: Alexander Graf > --- > target-ppc/op_helper.c | 11 +++++++++++ > 1 files changed, 11 insertions(+), 0 deletions(-) >=20 > diff --git a/target-ppc/op_helper.c b/target-ppc/op_helper.c > index 6339c95..0a88bf4 100644 > --- a/target-ppc/op_helper.c > +++ b/target-ppc/op_helper.c > @@ -4228,6 +4228,7 @@ void helper_booke206_tlbwe(void) > { > uint32_t tlbncfg, tlbn; > ppcmas_tlb_t *tlb; > + uint32_t size_tlb, size_min, size_max; > =20 > switch (env->spr[SPR_BOOKE_MAS0] & MAS0_WQ_MASK) { > case MAS0_WQ_ALWAYS: > @@ -4273,6 +4274,16 @@ void helper_booke206_tlbwe(void) > tlb->mas1 &=3D ~MAS1_IPROT; > } > =20 > + /* XXX only applies for MAV 1.0 */ > + size_tlb =3D (tlb->mas1 & MAS1_TSIZE_MASK) >> (MAS1_TSIZE_SHIFT + = 1); > + size_min =3D (tlbncfg & TLBnCFG_MINSIZE) >> TLBnCFG_MINSIZE_SHIFT; > + size_max =3D (tlbncfg & TLBnCFG_MAXSIZE) >> TLBnCFG_MAXSIZE_SHIFT; > + if ((size_tlb > size_max) || (size_tlb < size_max)) { This looks wrong...? Andreas > + /* set to min size */ > + tlb->mas1 &=3D ~MAS1_TSIZE_MASK; > + tlb->mas1 |=3D size_min << (MAS1_TSIZE_SHIFT + 1); > + } > + > if (booke206_tlb_to_page_size(env, tlb) =3D=3D TARGET_PAGE_SIZE) { > tlb_flush_page(env, tlb->mas2 & MAS2_EPN_MASK); > } else { --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg