From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:60198) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ro4z2-00050n-5g for qemu-devel@nongnu.org; Thu, 19 Jan 2012 22:17:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ro4yu-00012o-4Y for qemu-devel@nongnu.org; Thu, 19 Jan 2012 22:17:43 -0500 From: Alexander Graf Date: Fri, 20 Jan 2012 04:17:28 +0100 Message-Id: <1327029449-13220-6-git-send-email-agraf@suse.de> In-Reply-To: <1327029449-13220-1-git-send-email-agraf@suse.de> References: <1327029449-13220-1-git-send-email-agraf@suse.de> Subject: [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: qemu-ppc@nongnu.org Cc: Scott Wood , qemu-devel Developers 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. Signed-off-by: Alexander Graf --- target-ppc/op_helper.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) 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; switch (env->spr[SPR_BOOKE_MAS0] & MAS0_WQ_MASK) { case MAS0_WQ_ALWAYS: @@ -4273,6 +4274,16 @@ void helper_booke206_tlbwe(void) tlb->mas1 &= ~MAS1_IPROT; } + /* XXX only applies for MAV 1.0 */ + size_tlb = (tlb->mas1 & MAS1_TSIZE_MASK) >> (MAS1_TSIZE_SHIFT + 1); + size_min = (tlbncfg & TLBnCFG_MINSIZE) >> TLBnCFG_MINSIZE_SHIFT; + size_max = (tlbncfg & TLBnCFG_MAXSIZE) >> TLBnCFG_MAXSIZE_SHIFT; + if ((size_tlb > size_max) || (size_tlb < size_max)) { + /* set to min size */ + tlb->mas1 &= ~MAS1_TSIZE_MASK; + tlb->mas1 |= size_min << (MAS1_TSIZE_SHIFT + 1); + } + if (booke206_tlb_to_page_size(env, tlb) == TARGET_PAGE_SIZE) { tlb_flush_page(env, tlb->mas2 & MAS2_EPN_MASK); } else { -- 1.6.0.2