[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 06/11] hw/arm_boot.c: Extend secondary CPU bootlo
From: |
Evgeny Voevodin |
Subject: |
[Qemu-devel] [PATCH v5 06/11] hw/arm_boot.c: Extend secondary CPU bootloader. |
Date: |
Fri, 23 Dec 2011 15:40:09 +0400 |
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 extends bootloader for
secondary CPU to allow 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 <address@hidden>
---
hw/arm-misc.h | 1 +
hw/arm_boot.c | 23 +++++++++++++++--------
2 files changed, 16 insertions(+), 8 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..700a89d 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 <wfi> */
0xe12fff11, /* bx r1 */
- 0 /* privbase: Private memory region base address. */
+ 0, /* privbase: Private memory region base address. */
+ 0 /* bootreg: Boot register address is held here */
};
#define WRITE_WORD(p, value) do { \
@@ -179,6 +179,8 @@ static void do_cpu_reset(void *opaque)
{
CPUState *env = opaque;
const struct arm_boot_info *info = env->boot_info;
+ uint32_t smp_bootreg_addr = 0;
+ target_phys_addr_t p = info->smp_bootreg_addr;
cpu_reset(env);
if (info) {
@@ -197,6 +199,7 @@ static void do_cpu_reset(void *opaque)
info->loader_start);
}
} else {
+ WRITE_WORD(p, smp_bootreg_addr);
env->regs[15] = info->smp_loader_start;
}
}
@@ -272,8 +275,12 @@ 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;
- for (n = 0; n < sizeof(smpboot) / 4; n++) {
+ if (!info->smp_bootreg_addr) {
+ info->smp_bootreg_addr = 0x10000030;
+ }
+ smpboot[ARRAY_SIZE(smpboot) - 1] = info->smp_bootreg_addr;
+ smpboot[ARRAY_SIZE(smpboot) - 2] = info->smp_priv_base;
+ for (n = 0; n < ARRAY_SIZE(smpboot); n++) {
smpboot[n] = tswap32(smpboot[n]);
}
rom_add_blob_fixed("smpboot", smpboot, sizeof(smpboot),
--
1.7.4.1
- [Qemu-devel] [PATCH v5 00/11] ARM: Samsung Exynos4210-based boards support., Evgeny Voevodin, 2011/12/23
- [Qemu-devel] [PATCH v5 03/11] hw/sysbus.h: Increase maximum number of device IRQs., Evgeny Voevodin, 2011/12/23
- [Qemu-devel] [PATCH v5 04/11] ARM: exynos4210: IRQ subsystem support., Evgeny Voevodin, 2011/12/23
- [Qemu-devel] [PATCH v5 08/11] hw/exynos4210.c: Boot secondary CPU., Evgeny Voevodin, 2011/12/23
- [Qemu-devel] [PATCH v5 06/11] hw/arm_boot.c: Extend secondary CPU bootloader.,
Evgeny Voevodin <=
- [Qemu-devel] [PATCH v5 05/11] ARM: exynos4210: PWM support., Evgeny Voevodin, 2011/12/23
- [Qemu-devel] [PATCH v5 09/11] hw/lan9118: Add basic 16-bit mode support., Evgeny Voevodin, 2011/12/23
- [Qemu-devel] [PATCH v5 10/11] hw/exynos4210.c: Add LAN support for SMDKC210., Evgeny Voevodin, 2011/12/23
- [Qemu-devel] [PATCH v5 07/11] ARM: exynos4210: MCT support., Evgeny Voevodin, 2011/12/23
- [Qemu-devel] [PATCH v5 11/11] Exynos4210: added display controller implementation, Evgeny Voevodin, 2011/12/23
- [Qemu-devel] [PATCH v5 01/11] ARM: Samsung exynos 4210-based boards emulation, Evgeny Voevodin, 2011/12/23
- [Qemu-devel] [PATCH v5 02/11] ARM: exynos4210: UART support, Evgeny Voevodin, 2011/12/23