From patchwork Sat Jan 21 04:15:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 137163 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 C15661007D1 for ; Sat, 21 Jan 2012 16:07:57 +1100 (EST) Received: from localhost ([::1]:54128 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RoSNH-0006nm-Cq for incoming@patchwork.ozlabs.org; Fri, 20 Jan 2012 23:16:19 -0500 Received: from eggs.gnu.org ([140.186.70.92]:42544) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RoSMd-0005UY-Dg for qemu-devel@nongnu.org; Fri, 20 Jan 2012 23:15:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RoSMb-0000PU-HF for qemu-devel@nongnu.org; Fri, 20 Jan 2012 23:15:39 -0500 Received: from cantor2.suse.de ([195.135.220.15]:56997 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RoSMa-0000J4-On; Fri, 20 Jan 2012 23:15:36 -0500 Received: from relay2.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 1F3108FA97; Sat, 21 Jan 2012 05:15:31 +0100 (CET) From: Alexander Graf To: qemu-ppc@nongnu.org Date: Sat, 21 Jan 2012 05:15:24 +0100 Message-Id: <1327119330-29304-3-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1327119330-29304-1-git-send-email-agraf@suse.de> References: <1327119330-29304-1-git-send-email-agraf@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 195.135.220.15 Cc: Scott Wood , qemu-devel Developers Subject: [Qemu-devel] [PATCH 2/8] PPC: e500mc: add missing IVORs to bitmap 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 E500mc supports IVORs 36-41. Add them to the support mask. Drop SPE support too. Signed-off-by: Alexander Graf --- v1 -> v2: - drop SPE IVOR --- target-ppc/translate_init.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 83348b5..f5fcd1e 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -4433,6 +4433,7 @@ enum fsl_e500_version { static void init_proc_e500 (CPUPPCState *env, int version) { uint32_t tlbncfg[2]; + uint64_t ivor_mask = 0x0000000F0000FFFFULL; #if !defined(CONFIG_USER_ONLY) int i; #endif @@ -4444,7 +4445,10 @@ static void init_proc_e500 (CPUPPCState *env, int version) * complain when accessing them. * gen_spr_BookE(env, 0x0000000F0000FD7FULL); */ - gen_spr_BookE(env, 0x0000000F0000FFFFULL); + if (version == fsl_e500mc) { + ivor_mask = 0x000003FE0000FFFFULL; + } + gen_spr_BookE(env, ivor_mask); /* Processor identification */ spr_register(env, SPR_BOOKE_PIR, "PIR", SPR_NOACCESS, SPR_NOACCESS,