From patchwork Wed Jan 4 17:01:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 134301 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 17F71B6F9A for ; Thu, 5 Jan 2012 04:02:14 +1100 (EST) Received: from localhost ([::1]:45890 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RiUE1-00036F-AS for incoming@patchwork.ozlabs.org; Wed, 04 Jan 2012 12:02:05 -0500 Received: from eggs.gnu.org ([140.186.70.92]:35828) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RiUDr-0002vq-I7 for qemu-devel@nongnu.org; Wed, 04 Jan 2012 12:02:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RiUDh-0004Ar-On for qemu-devel@nongnu.org; Wed, 04 Jan 2012 12:01:55 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:39177) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RiUDh-0004AX-Ee for qemu-devel@nongnu.org; Wed, 04 Jan 2012 12:01:45 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1RiUDe-000692-D8; Wed, 04 Jan 2012 17:01:42 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Wed, 4 Jan 2012 17:01:42 +0000 Message-Id: <1325696502-23597-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 81.2.115.146 Cc: Mark Langsdorf , patches@linaro.org Subject: [Qemu-devel] [PATCH] vexpress, realview: Add (dummy) L2 cache controller 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 Instantiate the L2 cache controller on the ARM devboards which have one, since we have a dummy model of it now. Note that the only non-MP board with an L2x0 is the PB1176, which we don't model. Signed-off-by: Peter Maydell --- This is intended to be applied after the l2x0 implementation patch, obviously. hw/realview.c | 2 ++ hw/vexpress.c | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/hw/realview.c b/hw/realview.c index 750a279..fe75b03 100644 --- a/hw/realview.c +++ b/hw/realview.c @@ -223,6 +223,8 @@ static void realview_init(ram_addr_t ram_size, for (n = 0; n < smp_cpus; n++) { sysbus_connect_irq(busdev, n, cpu_irq[n]); } + sysbus_create_varargs("l2x0", realview_binfo.smp_priv_base + 0x2000, + NULL); } else { uint32_t gic_addr = is_pb ? 0x1e000000 : 0x10040000; /* For now just create the nIRQ GIC, and ignore the others. */ diff --git a/hw/vexpress.c b/hw/vexpress.c index 08c93d5..b8d69bb 100644 --- a/hw/vexpress.c +++ b/hw/vexpress.c @@ -176,6 +176,7 @@ static void vexpress_a9_init(ram_addr_t ram_size, /* 0x100ec000 TrustZone Address Space Controller */ /* 0x10200000 CoreSight debug APB */ /* 0x1e00a000 PL310 L2 Cache Controller */ + sysbus_create_varargs("l2x0", 0x1e00a000, NULL); /* CS0: NOR0 flash : 0x40000000 .. 0x44000000 */ /* CS4: NOR1 flash : 0x44000000 .. 0x48000000 */