From patchwork Tue Nov 22 07:59:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 127010 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6FFCAB70B7 for ; Tue, 22 Nov 2011 18:59:59 +1100 (EST) Received: from localhost ([::1]:40429 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RSlGd-0006F2-1j for incoming@patchwork.ozlabs.org; Tue, 22 Nov 2011 02:59:47 -0500 Received: from eggs.gnu.org ([140.186.70.92]:58794) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RSlGX-0006Em-79 for qemu-devel@nongnu.org; Tue, 22 Nov 2011 02:59:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RSlGV-0000cX-VW for qemu-devel@nongnu.org; Tue, 22 Nov 2011 02:59:41 -0500 Received: from [188.134.19.124] (port=32836 helo=octofox.metropolis) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RSlGV-0000cO-HJ for qemu-devel@nongnu.org; Tue, 22 Nov 2011 02:59:39 -0500 Received: from octofox.metropolis (localhost [127.0.0.1]) by octofox.metropolis (8.14.5/8.14.5) with ESMTP id pAM7xbnS009893; Tue, 22 Nov 2011 11:59:37 +0400 Received: (from jcmvbkbc@localhost) by octofox.metropolis (8.14.5/8.14.5/Submit) id pAM7xbNP009892; Tue, 22 Nov 2011 11:59:37 +0400 From: Max Filippov To: qemu-devel@nongnu.org Date: Tue, 22 Nov 2011 11:59:16 +0400 Message-Id: <1321948756-9852-1-git-send-email-jcmvbkbc@gmail.com> X-Mailer: git-send-email 1.7.6.4 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 188.134.19.124 Cc: Max Filippov Subject: [Qemu-devel] [PATCH] target-xtensa: fix MMUv3 initialization X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org - ITLB/DTLB ways 5 and 6 have 4 and 8 entries respectively; - ITLB/DTLB way 6 attr field is set to 3 on reset. Signed-off-by: Max Filippov --- target-xtensa/helper.c | 2 +- target-xtensa/overlay_tool.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target-xtensa/helper.c b/target-xtensa/helper.c index fc85815..2a0cb1a 100644 --- a/target-xtensa/helper.c +++ b/target-xtensa/helper.c @@ -273,7 +273,7 @@ static void reset_tlb_mmu_ways56(CPUState *env, entry[6][ei].vaddr = ei << 29; entry[6][ei].paddr = ei << 29; entry[6][ei].asid = 1; - entry[6][ei].attr = 2; + entry[6][ei].attr = 3; } } } diff --git a/target-xtensa/overlay_tool.h b/target-xtensa/overlay_tool.h index 9cef27d..df19cc9 100644 --- a/target-xtensa/overlay_tool.h +++ b/target-xtensa/overlay_tool.h @@ -256,7 +256,7 @@ .way_size = { \ (refill_way_size), (refill_way_size), \ (refill_way_size), (refill_way_size), \ - 4, 2, 2, 1, 1, 1, \ + 4, (way56) ? 4 : 2, (way56) ? 8 : 2, 1, 1, 1, \ }, \ .varway56 = (way56), \ .nrefillentries = (refill_way_size) * 4, \