Skip to contentSkip to conversation

target-arm: upgrade for secondary cpu bootloader

PATCH In review Evgeny Voevodin 2 participants 9 messages Aug 5, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 target-arm: upgrade for 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.

Quoted 1 line

From 851173b22dc2c5d5f8bb46eef07c452af78f61e8 Mon Sep 17 00:00:00 2001

From: Evgeny Voevodin <[email protected]>
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.

---
 hw/arm-misc.h |    1 +
 hw/arm_boot.c |   35 ++++++++++++++++++++++++++++++-----
 2 files changed, 31 insertions(+), 5 deletions(-)
hw/arm-misc.h +1 -0
index 010acb4..ef1d61d 100644
@@ -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;
hw/arm_boot.c +30 -5
index 620550b..59a6f05 100644
@@ -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;
     }
Signature · 1 line
1.7.4.1
#1 lore raw
Quoted 1 line

From 851173b22dc2c5d5f8bb46eef07c452af78f61e8 Mon Sep 17 00:00:00 2001

From: Evgeny Voevodin <[email protected]>
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.

---
 hw/arm-misc.h |    1 +
 hw/arm_boot.c |   35 ++++++++++++++++++++++++++++++-----
 2 files changed, 31 insertions(+), 5 deletions(-)
hw/arm-misc.h +1 -0
index 010acb4..ef1d61d 100644
@@ -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;
hw/arm_boot.c +30 -5
index 620550b..59a6f05 100644
@@ -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;
     }
Signature · 1 line
1.7.4.1
#2 lore raw
In reply to Evgeny Voevodin
Quoted 1 line

From 851173b22dc2c5d5f8bb46eef07c452af78f61e8 Mon Sep 17 00:00:00 2001

From: Evgeny Voevodin <[email protected]>
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.

---
 hw/arm-misc.h |    1 +
 hw/arm_boot.c |   35 ++++++++++++++++++++++++++++++-----
 2 files changed, 31 insertions(+), 5 deletions(-)
hw/arm-misc.h +1 -0
index 010acb4..ef1d61d 100644
@@ -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;
hw/arm_boot.c +30 -5
index 620550b..59a6f05 100644
@@ -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;
     }
Signature · 1 line
1.7.4.1
#3 lore raw

Sorry for flooding. Looks like my e-mail preferences have been broken.

#4 lore raw
In reply to Evgeny Voevodin
Quoted 1 line

From 851173b22dc2c5d5f8bb46eef07c452af78f61e8 Mon Sep 17 00:00:00 2001

From: Evgeny Voevodin <[email protected]>
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.

---
 hw/arm-misc.h |    1 +
 hw/arm_boot.c |   35 ++++++++++++++++++++++++++++++-----
 2 files changed, 31 insertions(+), 5 deletions(-)
hw/arm-misc.h +1 -0
index 010acb4..ef1d61d 100644
@@ -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;
hw/arm_boot.c +30 -5
index 620550b..59a6f05 100644
@@ -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;
     }
Signature · 1 line
1.7.4.1
#5 lore raw
In reply to Evgeny Voevodin
Quoted 5 lines · Evgeny Voevodin

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.

What's the motivation for this? (ie what target board needs this?) (Is there a patch 2/2 or is the subject wrong?)

Also, having a second almost-but-not-quite-identical copy of the secondary-cpu bootloader is definitely the wrong approach. If some boards need this then we should just have a single smpboot[] bootloader which has both privbase and startaddr specified as data members, and just have the code which sets it up fill in 0x10000030 if the board doesn't override the default.

-- PMM

#6 lore raw
Quoted 8 lines · Peter Maydell
Quoted 5 lines · Evgeny Voevodin

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.

What's the motivation for this? (ie what target board needs this?)

The motivation is that Samsung s5pc210 board which is under development needs this. Also, I believe that more boards will need it in future.

Quoted 1 line

(Is there a patch 2/2 or is the subject wrong?)

Subject is wrong.

Quoted 11 lines

Also, having a second almost-but-not-quite-identical copy of the secondary-cpu bootloader is definitely the wrong approach. If some boards need this then we should just have a single smpboot[] bootloader which has both privbase and startaddr specified as data members, and just have the code which sets it up fill in 0x10000030 if the board doesn't override the default.

-- PMM

Will update.

#7 lore raw
Quoted 5 lines · Evgeny Voevodin
Quoted 1 line · Peter Maydell

What's the motivation for this? (ie what target board needs this?)

The motivation is that Samsung s5pc210 board which is under development needs this. Also, I believe that more boards will need it in future.

Cool. Are you planning to submit this board model upstream? (on what timescale?)

thanks
-- PMM

#8 lore raw
In reply to Evgeny Voevodin

From 4c843ce18a7534e722670ecb892a2dedd3eae5b3 Mon Sep 17 00:00:00 2001
From: Evgeny Voevodin <[email protected]>
Date: Fri, 5 Aug 2011 17:24:48 +0400
Subject: [PATCH 1/1] target-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.

---
 hw/arm-misc.h |    1 +
 hw/arm_boot.c |   18 +++++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)
hw/arm-misc.h +1 -0
index 010acb4..ef1d61d 100644
@@ -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;
hw/arm_boot.c +11 -7
index 620550b..4557bbd 100644
@@ -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           /* startaddr: Where to find start address */
 };
 
 #define WRITE_WORD(p, value) do { \
@@ -269,7 +269,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_startaddr) {
+                info->smp_startaddr = 0x10000030;
+            }
+            smpboot[(sizeof(smpboot) - 8)/4] = info->smp_priv_base;
+            smpboot[(sizeof(smpboot) - 4)/4] = info->smp_startaddr;
             for (n = 0; n < sizeof(smpboot) / 4; n++) {
                 smpboot[n] = tswap32(smpboot[n]);
             }
Signature · 1 line
1.7.4.1