From patchwork Wed Dec 7 09:46:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Voevodin X-Patchwork-Id: 129926 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 CA2941007D2 for ; Wed, 7 Dec 2011 20:48:29 +1100 (EST) Received: from localhost ([::1]:50090 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RYE6u-0001Ax-QC for incoming@patchwork.ozlabs.org; Wed, 07 Dec 2011 04:48:20 -0500 Received: from eggs.gnu.org ([140.186.70.92]:55957) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RYE6X-0000WY-HW for qemu-devel@nongnu.org; Wed, 07 Dec 2011 04:47:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RYE6T-0001ya-QY for qemu-devel@nongnu.org; Wed, 07 Dec 2011 04:47:57 -0500 Received: from mailout3.w1.samsung.com ([210.118.77.13]:45828) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RYE6T-0001yE-Kf for qemu-devel@nongnu.org; Wed, 07 Dec 2011 04:47:53 -0500 MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from euspt1 ([210.118.77.13]) by mailout3.w1.samsung.com (Sun Java(tm) System Messaging Server 6.3-8.04 (built Jul 29 2009; 32bit)) with ESMTP id <0LVT003A8V7S0S30@mailout3.w1.samsung.com> for qemu-devel@nongnu.org; Wed, 07 Dec 2011 09:47:52 +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:52 +0000 (GMT) Date: Wed, 07 Dec 2011 13:46:56 +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-6-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.13 Cc: d.solodkiy@samsung.com, Evgeny Voevodin Subject: [Qemu-devel] [PATCH 05/14] hw/arm_boot.c: Add new secondary CPU bootloader. 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 Secondary CPU bootloader enables interrupt and issues wfi until start address is written to system controller. The position where to find this start address is hardcoded to 0x10000030. This commit adds new bootloader for secondary CPU which allows a target board to cpecify a position where to find start address. If target board doesn't specify start address then default 0x10000030 is used Signed-off-by: Evgeny Voevodin --- hw/arm-misc.h | 1 + hw/arm_boot.c | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/hw/arm-misc.h b/hw/arm-misc.h index af403a1..6e8ae6b 100644 --- a/hw/arm-misc.h +++ b/hw/arm-misc.h @@ -31,6 +31,7 @@ struct arm_boot_info { const char *initrd_filename; target_phys_addr_t loader_start; target_phys_addr_t smp_loader_start; + target_phys_addr_t smp_bootreg_addr; target_phys_addr_t smp_priv_base; int nb_cpus; int board_id; diff --git a/hw/arm_boot.c b/hw/arm_boot.c index 215d5de..ecaac22 100644 --- a/hw/arm_boot.c +++ b/hw/arm_boot.c @@ -31,17 +31,17 @@ static uint32_t bootloader[] = { /* Entry point for secondary CPUs. Enable interrupt controller and Issue WFI until start address is written to system controller. */ static uint32_t smpboot[] = { - 0xe59f0020, /* ldr r0, privbase */ - 0xe3a01001, /* mov r1, #1 */ - 0xe5801100, /* str r1, [r0, #0x100] */ - 0xe3a00201, /* mov r0, #0x10000000 */ - 0xe3800030, /* orr r0, #0x30 */ + 0xe59f201c, /* ldr r2, privbase */ + 0xe59f001c, /* ldr r0, startaddr */ + 0xe3a01001, /* mov r1, #1 */ + 0xe5821100, /* str r1, [r2, #256] */ 0xe320f003, /* wfi */ 0xe5901000, /* ldr r1, [r0] */ 0xe1110001, /* tst r1, r1 */ 0x0afffffb, /* beq */ 0xe12fff11, /* bx r1 */ - 0 /* privbase: Private memory region base address. */ + 0, /* privbase: Private memory region base address. */ + 0 /* bootreg: Boot register address is hold here */ }; #define WRITE_WORD(p, value) do { \ @@ -179,6 +179,7 @@ static void do_cpu_reset(void *opaque) { CPUState *env = opaque; const struct arm_boot_info *info = env->boot_info; + uint8_t smp_bootreg_addr[4] = {0}; cpu_reset(env); if (info) { @@ -197,6 +198,8 @@ static void do_cpu_reset(void *opaque) info->loader_start); } } else { + cpu_physical_memory_rw(info->smp_bootreg_addr, smp_bootreg_addr, + sizeof(smp_bootreg_addr), 1); env->regs[15] = info->smp_loader_start; } } @@ -262,6 +265,7 @@ void arm_load_kernel(CPUState *env, struct arm_boot_info *info) } else { initrd_size = 0; } + bootloader[1] |= info->board_id & 0xff; bootloader[2] |= (info->board_id >> 8) & 0xff; bootloader[5] = info->loader_start + KERNEL_ARGS_ADDR; @@ -272,7 +276,11 @@ void arm_load_kernel(CPUState *env, struct arm_boot_info *info) rom_add_blob_fixed("bootloader", bootloader, sizeof(bootloader), info->loader_start); if (info->nb_cpus > 1) { - smpboot[10] = info->smp_priv_base; + if (!info->smp_bootreg_addr) { + info->smp_bootreg_addr = 0x10000030; + } + smpboot[(sizeof(smpboot) - 8)/4] = info->smp_priv_base; + smpboot[(sizeof(smpboot) - 4)/4] = info->smp_bootreg_addr; for (n = 0; n < sizeof(smpboot) / 4; n++) { smpboot[n] = tswap32(smpboot[n]); }