ARMv8: preparing bootdriver for parking protocol and adding basic debug

Signed-off-by: Reto Achermann <reto.achermann@inf.ethz.ch>

diff --git a/kernel/arch/armv8/boot/boot_entry.S b/kernel/arch/armv8/boot/boot_entry.S
index 6ea8790..97839c0 100644 (file)
--- a/kernel/arch/armv8/boot/boot_entry.S
+++ b/kernel/arch/armv8/boot/boot_entry.S
@@ -83,6 +83,12 @@ boot_entry_psci:
 
 
 boot_entry_parking:
+    /*
+        we are using the remainder of the OS use part of the parking frame for
+        the stack
+     */
+    add sp, x0, #2032
+    b boot_app_init
     wfi
 
 /* Error return required to drop to lower execution levels */

diff --git a/kernel/arch/armv8/boot/boot_generic.c b/kernel/arch/armv8/boot/boot_generic.c
index 0cd651a..0eed33f 100644 (file)
--- a/kernel/arch/armv8/boot/boot_generic.c
+++ b/kernel/arch/armv8/boot/boot_generic.c
@@ -36,6 +36,65 @@ void boot_bsp_init(uint32_t magic, lpaddr_t pointer, lpaddr_t stack)
 void boot_app_init(lpaddr_t context)
     __attribute__((noreturn));
 
+/* low level debugging facilities */
+#if DEBUG
+#ifdef THUNDERX
+#include <dev/pl011_uart_dev.h>
+
+#define CN88XX_MAP_UART0_OFFSET 0x87E024000000UL
+
+static pl011_uart_t uart;
+
+static void debug_uart_initialize(void) {
+    pl011_uart_initialize(&uart, (mackerel_addr_t) CN88XX_MAP_UART0_OFFSET);
+}
+
+static void debug_serial_putc(char c)
+{
+    while(pl011_uart_FR_txff_rdf(&uart) == 1) ;
+    pl011_uart_DR_rawwr(&uart, c);
+}
+#elif defined(XGENE)
+#include <dev/apm88xxxx/apm88xxxx_pc16550_dev.h>
+
+#define CN88XX_MAP_UART0_OFFSET 0x87E024000000UL
+
+apm88xxxx_pc16550_t uart;
+
+static void debug_uart_initialize(void) {
+    apm88xxxx_pc16550_initialize(&uart, (mackerel_addr_t)0x1C020000);
+}
+
+static void debug_serial_putc(char c)
+{
+    // Wait until FIFO can hold more characters
+    while(!apm88xxxx_pc16550_LSR_thre_rdf(&uart));
+    // Write character
+    apm88xxxx_pc16550_THR_thr_wrf(&uart, c);
+}
+
+#endif
+
+static void debug_serial_putchar(char c) {
+    if (c == '\n') {
+        debug_serial_putc('\r');
+    }
+    debug_serial_putc(c);
+}
+
+
+static void debug_print_string(char *str)
+{
+    while (str && *str) {
+        debug_serial_putchar(*str);
+        str++;
+    }
+}
+#else
+#define debug_print_string(x)
+#define debug_uart_initialize()
+#endif
+
 
 void (*cpu_driver_entry)(uint32_t magic, lpaddr_t pointer, lpaddr_t stack);
 
@@ -426,42 +485,6 @@ static void jump_to_cpudriver(uint32_t magic, lpaddr_t pointer, lpaddr_t stack)
 
 }
 
-#if 0
-#include <dev/pl011_uart_dev.h>
-
-#define CN88XX_MAP_UART0_OFFSET 0x87E024000000UL
-
-static pl011_uart_t uart;
-
-static void debug_uart_initialize(void) {
-    pl011_uart_initialize(&uart, (mackerel_addr_t) CN88XX_MAP_UART0_OFFSET);
-}
-
-static void debug_serial_putc(char c)
-{
-    while(pl011_uart_FR_txff_rdf(&uart) == 1) ;
-    pl011_uart_DR_rawwr(&uart, c);
-}
-
-static void debug_serial_putchar(char c) {
-    if (c == '\n') {
-        debug_serial_putc('\r');
-    }
-    debug_serial_putc(c);
-}
-
-
-static void debug_print_string(char *str)
-{
-    while (str && *str) {
-        debug_serial_putchar(*str);
-        str++;
-    }
-}
-#else
-#define debug_print_string(x)
-#define debug_uart_initialize()
-#endif
 
 /* On entry:
 
@@ -532,6 +555,9 @@ static void boot_generic_init(uint32_t magic, lpaddr_t pointer, lpaddr_t stack)
 void boot_app_init(lpaddr_t state)
 {
 
+    debug_uart_initialize();
+    debug_print_string("APP BOOTING\n");
+
     struct armv8_core_data *cd = (struct armv8_core_data *)state;
 
     cpu_driver_entry = (void *)cd->cpu_driver_entry;
@@ -594,8 +620,7 @@ void
 boot_bsp_init(uint32_t magic, lpaddr_t pointer, lpaddr_t stack) {
 
     debug_uart_initialize();
-
-    debug_print_string("BOOOTING\n");
+    debug_print_string("BSP BOOTING\n");
 
     /* Boot magic must be set */
     if (magic != MULTIBOOT2_BOOTLOADER_MAGIC) {