target-arm: upgrade for secondary cpu bootloader

Submitted by Evgeny Voevodin on Aug. 5, 2011, 11:04 a.m.

Details

Message ID 4E3BCE59.6010601@samsung.com
State New
Headers show

Commit Message

Evgeny Voevodin Aug. 5, 2011, 11:04 a.m.

Patch hide | download patch | download mbox

From 851173b22dc2c5d5f8bb46eef07c452af78f61e8 Mon Sep 17 00:00:00 2001
From: Evgeny Voevodin <e.voevodin@samsung.com>
Date: Fri, 29 Jul 2011 09:36:21 +0400
Subject: [PATCH 1/2] arm: Add new secondary CPU bootloader

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.

Signed-off-by: Evgeny Voevodin <e.voevodin@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
 hw/arm-misc.h |    1 +
 hw/arm_boot.c |   35 ++++++++++++++++++++++++++++++-----
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/hw/arm-misc.h b/hw/arm-misc.h
index 010acb4..ef1d61d 100644
--- a/hw/arm-misc.h
+++ b/hw/arm-misc.h
@@ -28,6 +28,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_startaddr;
     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 620550b..59a6f05 100644
--- a/hw/arm_boot.c
+++ b/hw/arm_boot.c
@@ -44,6 +44,20 @@  static uint32_t smpboot[] = {
   0 /* privbase: Private memory region base address.  */
 };
 
+static uint32_t smpboot2[] = {
+        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           /* startaddr: Where to find start address */
+};
+
 #define WRITE_WORD(p, value) do { \
     stl_phys_notdirty(p, value);  \
     p += 4;                       \
@@ -269,12 +283,23 @@  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[n] = tswap32(smpboot[n]);
+            if (info->smp_startaddr) {
+                smpboot2[(sizeof(smpboot2) - 8)/4] = info->smp_priv_base;
+                smpboot2[(sizeof(smpboot2) - 4)/4] = info->smp_startaddr;
+                for (n = 0; n < sizeof(smpboot2) / 4; n++) {
+                    smpboot2[n] = tswap32(smpboot2[n]);
+                }
+                rom_add_blob_fixed("smpboot2", smpboot2, sizeof(smpboot2),
+                        info->smp_loader_start);
+            }
+            else {
+                smpboot[10] = info->smp_priv_base;
+                for (n = 0; n < sizeof(smpboot) / 4; n++) {
+                    smpboot[n] = tswap32(smpboot[n]);
+                }
+                rom_add_blob_fixed("smpboot", smpboot, sizeof(smpboot),
+                        info->smp_loader_start);
             }
-            rom_add_blob_fixed("smpboot", smpboot, sizeof(smpboot),
-                               info->smp_loader_start);
         }
         info->initrd_size = initrd_size;
     }
-- 
1.7.4.1