[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 02/10] hw/arm_boot.c: Make SMP boards specify add
From: |
Evgeny Voevodin |
Subject: |
[Qemu-devel] [PATCH v6 02/10] hw/arm_boot.c: Make SMP boards specify address to poll in bootup loop |
Date: |
Thu, 12 Jan 2012 12:34:09 +0400 |
The secondary CPU bootloader in arm_boot.c holds secondary CPUs in a
pen until the primary CPU releases them. Make boards specify the
address to be polled to determine whether to leave the pen (it was
previously hardcoded to 0x10000030, which is a Versatile Express/
Realview specific system register address).
Signed-off-by: Evgeny Voevodin <address@hidden>
---
hw/arm-misc.h | 1 +
hw/arm_boot.c | 18 ++++++++++--------
hw/realview.c | 2 ++
hw/vexpress.c | 2 ++
4 files changed, 15 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..bf509a8 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 { \
@@ -197,6 +197,7 @@ static void do_cpu_reset(void *opaque)
info->loader_start);
}
} else {
+ stl_phys_notdirty(info->smp_bootreg_addr, 0);
env->regs[15] = info->smp_loader_start;
}
}
@@ -272,8 +273,9 @@ 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++) {
+ 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),
diff --git a/hw/realview.c b/hw/realview.c
index d4191e9..3f35118 100644
--- a/hw/realview.c
+++ b/hw/realview.c
@@ -21,6 +21,7 @@
#include "exec-memory.h"
#define SMP_BOOT_ADDR 0xe0000000
+#define SMP_BOOTREG_ADDR 0x10000030
typedef struct {
SysBusDevice busdev;
@@ -96,6 +97,7 @@ static void realview_register_devices(void)
static struct arm_boot_info realview_binfo = {
.smp_loader_start = SMP_BOOT_ADDR,
+ .smp_bootreg_addr = SMP_BOOTREG_ADDR,
};
/* The following two lists must be consistent. */
diff --git a/hw/vexpress.c b/hw/vexpress.c
index c9ca43c..abdca14 100644
--- a/hw/vexpress.c
+++ b/hw/vexpress.c
@@ -28,11 +28,13 @@
#include "exec-memory.h"
#define SMP_BOOT_ADDR 0xe0000000
+#define SMP_BOOTREG_ADDR 0x10000030
#define VEXPRESS_BOARD_ID 0x8e0
static struct arm_boot_info vexpress_binfo = {
.smp_loader_start = SMP_BOOT_ADDR,
+ .smp_bootreg_addr = SMP_BOOTREG_ADDR,
};
static void vexpress_a9_init(ram_addr_t ram_size,
--
1.7.4.1
- [Qemu-devel] [PATCH v6 00/10] ARM: Samsung Exynos4210-based boards support., Evgeny Voevodin, 2012/01/12
- [Qemu-devel] [PATCH v6 08/10] hw/lan9118: Add basic 16-bit mode support., Evgeny Voevodin, 2012/01/12
- [Qemu-devel] [PATCH v6 05/10] ARM: exynos4210: UART support, Evgeny Voevodin, 2012/01/12
- [Qemu-devel] [PATCH v6 01/10] hw/sysbus.h: Increase maximum number of device IRQs., Evgeny Voevodin, 2012/01/12
- [Qemu-devel] [PATCH v6 06/10] ARM: exynos4210: PWM support., Evgeny Voevodin, 2012/01/12
- [Qemu-devel] [PATCH v6 02/10] hw/arm_boot.c: Make SMP boards specify address to poll in bootup loop,
Evgeny Voevodin <=
- [Qemu-devel] [PATCH v6 03/10] ARM: exynos4210: IRQ subsystem support., Evgeny Voevodin, 2012/01/12
- [Qemu-devel] [PATCH v6 09/10] hw/exynos4210.c: Add LAN support for SMDKC210., Evgeny Voevodin, 2012/01/12
- [Qemu-devel] [PATCH v6 07/10] ARM: exynos4210: MCT support., Evgeny Voevodin, 2012/01/12
- [Qemu-devel] [PATCH v6 04/10] ARM: Samsung exynos 4210-based boards emulation, Evgeny Voevodin, 2012/01/12
- [Qemu-devel] [PATCH v6 10/10] Exynos4210: added display controller implementation, Evgeny Voevodin, 2012/01/12