From patchwork Fri Feb 3 18:30:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 139436 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 22DDF104796 for ; Sat, 4 Feb 2012 05:30:59 +1100 (EST) Received: from localhost ([::1]:56402 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtNuS-0007s9-38 for incoming@patchwork.ozlabs.org; Fri, 03 Feb 2012 13:30:56 -0500 Received: from eggs.gnu.org ([140.186.70.92]:56844) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtNu8-0007eM-Qe for qemu-devel@nongnu.org; Fri, 03 Feb 2012 13:30:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RtNu6-00078P-2n for qemu-devel@nongnu.org; Fri, 03 Feb 2012 13:30:36 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:42608) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtNu5-00076x-JK for qemu-devel@nongnu.org; Fri, 03 Feb 2012 13:30:34 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1RtNu0-0005i6-Ci; Fri, 03 Feb 2012 18:30:28 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 3 Feb 2012 18:30:24 +0000 Message-Id: <1328293828-21921-4-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1328293828-21921-1-git-send-email-peter.maydell@linaro.org> References: <1328293828-21921-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 81.2.115.146 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , patches@linaro.org Subject: [Qemu-devel] [PATCH v4 3/7] hw/vexpress.c: Move secondary CPU boot code to SRAM 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 On real Versatile Express hardware, the boot ROM puts the secondary CPU bootcode/holding pen in SRAM. We can therefore rely on Linux not trashing this memory until secondary CPUs have booted up, and can put our QEMU-specific pen code in the same place. This allows us to drop the odd "hack" RAM page we were using before. Signed-off-by: Peter Maydell --- hw/vexpress.c | 16 ++-------------- 1 files changed, 2 insertions(+), 14 deletions(-) diff --git a/hw/vexpress.c b/hw/vexpress.c index 8c4d3b3..99a9690 100644 --- a/hw/vexpress.c +++ b/hw/vexpress.c @@ -30,13 +30,9 @@ #include "boards.h" #include "exec-memory.h" -#define SMP_BOOT_ADDR 0xe0000000 - #define VEXPRESS_BOARD_ID 0x8e0 -static struct arm_boot_info vexpress_binfo = { - .smp_loader_start = SMP_BOOT_ADDR, -}; +static struct arm_boot_info vexpress_binfo; /* Address maps for peripherals: * the Versatile Express motherboard has two possible maps, @@ -118,7 +114,6 @@ static void vexpress_a9_init(ram_addr_t ram_size, MemoryRegion *lowram = g_new(MemoryRegion, 1); MemoryRegion *vram = g_new(MemoryRegion, 1); MemoryRegion *sram = g_new(MemoryRegion, 1); - MemoryRegion *hackram = g_new(MemoryRegion, 1); DeviceState *dev, *sysctl, *pl041; SysBusDevice *busdev; qemu_irq *irqp; @@ -275,14 +270,6 @@ static void vexpress_a9_init(ram_addr_t ram_size, /* VE_DAPROM: not modelled */ - /* ??? Hack to map an additional page of ram for the secondary CPU - startup code. I guess this works on real hardware because the - BootROM happens to be in ROM/flash or in memory that isn't clobbered - until after Linux boots the secondary CPUs. */ - memory_region_init_ram(hackram, "vexpress.hack", 0x1000); - vmstate_register_ram_global(hackram); - memory_region_add_subregion(sysmem, SMP_BOOT_ADDR, hackram); - vexpress_binfo.ram_size = ram_size; vexpress_binfo.kernel_filename = kernel_filename; vexpress_binfo.kernel_cmdline = kernel_cmdline; @@ -290,6 +277,7 @@ static void vexpress_a9_init(ram_addr_t ram_size, vexpress_binfo.nb_cpus = smp_cpus; vexpress_binfo.board_id = VEXPRESS_BOARD_ID; vexpress_binfo.loader_start = 0x60000000; + vexpress_binfo.smp_loader_start = map[VE_SRAM]; vexpress_binfo.smp_bootreg_addr = map[VE_SYSREGS] + 0x30; arm_load_kernel(first_cpu, &vexpress_binfo); }