From patchwork Sat Sep 11 14:09:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 64519 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CD09BB6F0D for ; Sun, 12 Sep 2010 00:30:01 +1000 (EST) Received: from localhost ([127.0.0.1]:57284 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OuR5V-0004L8-5P for incoming@patchwork.ozlabs.org; Sat, 11 Sep 2010 10:29:53 -0400 Received: from [140.186.70.92] (port=54164 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OuR0Y-0001VN-FA for qemu-devel@nongnu.org; Sat, 11 Sep 2010 10:24:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OuR0X-0006lQ-7O for qemu-devel@nongnu.org; Sat, 11 Sep 2010 10:24:46 -0400 Received: from ra.se.axis.com ([195.60.68.13]:58434) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OuR0X-0006lG-1H for qemu-devel@nongnu.org; Sat, 11 Sep 2010 10:24:45 -0400 Received: from localhost (localhost [127.0.0.1]) by ra.se.axis.com (Postfix) with ESMTP id 754B911EB2; Sat, 11 Sep 2010 16:24:44 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at ra.se.axis.com Received: from ra.se.axis.com ([127.0.0.1]) by localhost (ra.se.axis.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id dnLMR2c9UmcS; Sat, 11 Sep 2010 16:24:43 +0200 (CEST) Received: from miranda.se.axis.com (miranda.se.axis.com [10.0.2.171]) by ra.se.axis.com (Postfix) with ESMTPS id E812B11E97; Sat, 11 Sep 2010 16:24:43 +0200 (CEST) Received: from localhost (edgar.se.axis.com [10.93.151.1]) by miranda.se.axis.com (8.13.4/8.13.4/Debian-3sarge3) with ESMTP id o8BEOh8T002693; Sat, 11 Sep 2010 16:24:43 +0200 From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org Date: Sat, 11 Sep 2010 16:09:56 +0200 Message-Id: <1284214197-27140-4-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1284214197-27140-1-git-send-email-edgar.iglesias@gmail.com> References: <1284214197-27140-1-git-send-email-edgar.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: "Edgar E. Iglesias" , Alexander Graf Subject: [Qemu-devel] [PATCH 3/4] powerpc: Add a ppc-440x5 Xilinx model X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add a powerpc 440x5 with the model ID on the Xilinx virtex5. Connect the 440x5 to the 40x interrupt logic. Signed-off-by: Edgar E. Iglesias --- target-ppc/translate_init.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 2bd8b00..05ffe95 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -3596,7 +3596,6 @@ static void init_proc_440x4 (CPUPPCState *env) POWERPC_FLAG_DE | POWERPC_FLAG_BUS_CLK) #define check_pow_440x5 check_pow_nocheck -__attribute__ (( unused )) static void init_proc_440x5 (CPUPPCState *env) { /* Time base */ @@ -3656,7 +3655,7 @@ static void init_proc_440x5 (CPUPPCState *env) init_excp_BookE(env); env->dcache_line_size = 32; env->icache_line_size = 32; - /* XXX: TODO: allocate internal IRQ controller */ + ppc40x_irq_init(env); } /* PowerPC 460 (guessed) */ @@ -6536,6 +6535,7 @@ enum { #if 0 CPU_POWERPC_440A4 = xxx, #endif + CPU_POWERPC_440_XILINX = 0x7ff21910, #if 0 CPU_POWERPC_440A5 = xxx, #endif @@ -7464,6 +7464,8 @@ static const ppc_def_t ppc_defs[] = { /* PowerPC 440 A4 */ POWERPC_DEF("440A4", CPU_POWERPC_440A4, 440x4), #endif + /* PowerPC 440 Xilinx 5 */ + POWERPC_DEF("440-Xilinx", CPU_POWERPC_440_XILINX, 440x5), #if defined (TODO) /* PowerPC 440 A5 */ POWERPC_DEF("440A5", CPU_POWERPC_440A5, 440x5),