From patchwork Wed Dec 7 09:46:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Voevodin X-Patchwork-Id: 129930 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 A97F01007D2 for ; Wed, 7 Dec 2011 21:26:47 +1100 (EST) Received: from localhost ([::1]:53373 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RYE7T-0002uv-Oq for incoming@patchwork.ozlabs.org; Wed, 07 Dec 2011 04:48:55 -0500 Received: from eggs.gnu.org ([140.186.70.92]:56016) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RYE6d-0000rY-It for qemu-devel@nongnu.org; Wed, 07 Dec 2011 04:48:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RYE6b-00020b-5u for qemu-devel@nongnu.org; Wed, 07 Dec 2011 04:48:03 -0500 Received: from mailout4.w1.samsung.com ([210.118.77.14]:17609) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RYE6a-00020P-Ni for qemu-devel@nongnu.org; Wed, 07 Dec 2011 04:48:00 -0500 MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from euspt1 ([210.118.77.14]) by mailout4.w1.samsung.com (Sun Java(tm) System Messaging Server 6.3-8.04 (built Jul 29 2009; 32bit)) with ESMTP id <0LVT002BJV7YJC30@mailout4.w1.samsung.com> for qemu-devel@nongnu.org; Wed, 07 Dec 2011 09:47:58 +0000 (GMT) Received: from evvoevodinPC.rnd.samsung.ru ([106.109.8.48]) by spt1.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0LVT00GNZV7ATA@spt1.w1.samsung.com> for qemu-devel@nongnu.org; Wed, 07 Dec 2011 09:47:58 +0000 (GMT) Date: Wed, 07 Dec 2011 13:46:59 +0400 From: Evgeny Voevodin In-reply-to: <1323251225-1072-1-git-send-email-e.voevodin@samsung.com> To: qemu-devel@nongnu.org Message-id: <1323251225-1072-9-git-send-email-e.voevodin@samsung.com> X-Mailer: git-send-email 1.7.4.1 References: <1323251225-1072-1-git-send-email-e.voevodin@samsung.com> X-detected-operating-system: by eggs.gnu.org: Solaris 9.1 X-Received-From: 210.118.77.14 Cc: d.solodkiy@samsung.com, Evgeny Voevodin Subject: [Qemu-devel] [PATCH 08/14] ARM: s5pc210: Boot secondary CPU. 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 Signed-off-by: Evgeny Voevodin --- hw/s5pc210.c | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/hw/s5pc210.c b/hw/s5pc210.c index eabe3b1..90858e9 100644 --- a/hw/s5pc210.c +++ b/hw/s5pc210.c @@ -97,6 +97,12 @@ #define S5PC210_BASE_BOOT_ADDR S5PC210_DRAM0_BASE_ADDR +/* Secondary CPU startup code is in IROM memory */ +#define S5PC210_SMP_BOOT_ADDR S5PC210_IROM_BASE_ADDR + +/* Secondary CPU polling address to get loader start from */ +#define S5PC210_SECOND_CPU_BOOTREG 0x10020814 + static struct arm_boot_info s5pc210_binfo = { .loader_start = S5PC210_BASE_BOOT_ADDR, }; @@ -213,6 +219,8 @@ static void s5pc210_init(ram_addr_t ram_size, MemoryRegion *irom_alias_mem = g_new(MemoryRegion, 1); MemoryRegion *dram0_mem = g_new(MemoryRegion, 1); MemoryRegion *dram1_mem = NULL; + MemoryRegion *hack_mem = g_new(MemoryRegion, 1); + MemoryRegion *bootreg_mem = g_new(MemoryRegion, 1); S5pc210Irq *irqs; qemu_irq *irq_table; qemu_irq *irqp; @@ -225,9 +233,11 @@ static void s5pc210_init(ram_addr_t ram_size, switch (board_type) { case BOARD_S5PC210_NURI: s5pc210_binfo.board_id = MACH_NURI_ID; + s5pc210_binfo.smp_bootreg_addr = S5PC210_SECOND_CPU_BOOTREG; break; case BOARD_S5PC210_SMDKC210: s5pc210_binfo.board_id = MACH_SMDKC210_ID; + s5pc210_binfo.smp_bootreg_addr = S5PC210_SECOND_CPU_BOOTREG; break; default: break; @@ -353,6 +363,20 @@ static void s5pc210_init(ram_addr_t ram_size, memory_region_add_subregion(system_mem, S5PC210_DRAM0_BASE_ADDR, dram0_mem); + /* + * Secondary CPU startup code will be placed here. + */ + memory_region_init_ram(hack_mem, NULL, "s5pc210.hack", 0x1000); + memory_region_add_subregion(system_mem, S5PC210_SMP_BOOT_ADDR, + hack_mem); + + /* + * Hack: Map SECOND_CPU_BOOTREG, because it is in PMU USER5 register. + */ + memory_region_init_ram(bootreg_mem, NULL, "s5pc210.bootreg", 0x4); + memory_region_add_subregion(system_mem, S5PC210_SECOND_CPU_BOOTREG, + bootreg_mem); + /* CMU */ sysbus_create_simple("s5pc210.cmu", S5PC210_CMU_BASE_ADDR, NULL); @@ -429,7 +453,7 @@ static void s5pc210_init(ram_addr_t ram_size, s5pc210_binfo.kernel_filename = kernel_filename; s5pc210_binfo.initrd_filename = initrd_filename; s5pc210_binfo.kernel_cmdline = kernel_cmdline; - + s5pc210_binfo.smp_priv_base = S5PC210_SMP_PRIVATE_BASE_ADDR; arm_load_kernel(first_cpu, &s5pc210_binfo); }