From patchwork Tue Jan 22 01:53:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 214328 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7BF492C007C for ; Tue, 22 Jan 2013 12:54:41 +1100 (EST) Received: from localhost ([::1]:56297 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxT4R-00036L-D9 for incoming@patchwork.ozlabs.org; Mon, 21 Jan 2013 20:54:39 -0500 Received: from eggs.gnu.org ([208.118.235.92]:43793) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxT44-0002ws-Fa for qemu-devel@nongnu.org; Mon, 21 Jan 2013 20:54:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TxT42-0002Tl-1D for qemu-devel@nongnu.org; Mon, 21 Jan 2013 20:54:16 -0500 Received: from co1ehsobe001.messaging.microsoft.com ([216.32.180.184]:22519 helo=co1outboundpool.messaging.microsoft.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxT3t-0002Ql-Ua; Mon, 21 Jan 2013 20:54:06 -0500 Received: from mail213-co1-R.bigfish.com (10.243.78.206) by CO1EHSOBE009.bigfish.com (10.243.66.72) with Microsoft SMTP Server id 14.1.225.23; Tue, 22 Jan 2013 01:54:03 +0000 Received: from mail213-co1 (localhost [127.0.0.1]) by mail213-co1-R.bigfish.com (Postfix) with ESMTP id 70395980071; Tue, 22 Jan 2013 01:54:03 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1ee6h1de0h1202h1e76h1d1ah1d2ahzz8275bhz2dh2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1155h) Received: from mail213-co1 (localhost.localdomain [127.0.0.1]) by mail213-co1 (MessageSwitch) id 1358819642467960_15982; Tue, 22 Jan 2013 01:54:02 +0000 (UTC) Received: from CO1EHSMHS006.bigfish.com (unknown [10.243.78.203]) by mail213-co1.bigfish.com (Postfix) with ESMTP id 6F7CAC004C; Tue, 22 Jan 2013 01:54:02 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CO1EHSMHS006.bigfish.com (10.243.66.16) with Microsoft SMTP Server (TLS) id 14.1.225.23; Tue, 22 Jan 2013 01:54:02 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-001.039d.mgd.msft.net (10.84.1.13) with Microsoft SMTP Server (TLS) id 14.2.318.3; Tue, 22 Jan 2013 01:54:01 +0000 Received: from snotra.am.freescale.net ([10.214.82.223]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id r0M1rti5023131; Mon, 21 Jan 2013 18:54:00 -0700 From: Scott Wood To: Alexander Graf Date: Mon, 21 Jan 2013 19:53:54 -0600 Message-ID: <1358819635-28574-5-git-send-email-scottwood@freescale.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1358819635-28574-1-git-send-email-scottwood@freescale.com> References: <1358819635-28574-1-git-send-email-scottwood@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 X-Received-From: 216.32.180.184 Cc: Scott Wood , qemu-ppc@nongnu.org, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 4/5] PPC: e500: fix mpic_iack address 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 MPIC+0xa0 is IACK for the current CPU. MPIC+0x200a0 is IACK for CPU 0. This fix allows EPR to work with an SMP target. Signed-off-by: Scott Wood --- hw/ppc/e500.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 9ccf4d1..530f929 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -505,7 +505,7 @@ void ppce500_init(PPCE500Params *params) irqs[i][OPENPIC_OUTPUT_CINT] = input[PPCE500_INPUT_CINT]; env->spr[SPR_BOOKE_PIR] = cs->cpu_index = i; env->mpic_iack = MPC8544_CCSRBAR_BASE + - MPC8544_MPIC_REGS_OFFSET + 0x200A0; + MPC8544_MPIC_REGS_OFFSET + 0xa0; ppc_booke_timers_init(cpu, 400000000, PPC_TIMER_E500);