Changeset ebb3538 in mainline

Timestamp:

2021-09-15T15:01:03Z (3 years ago)

Author:

Martin Decky <martin@…>

Branches:

master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5ecac7e

Parents:

8ce56a6

Message:

Improve early kernel debugging prints

Since the early kernel debugging prints are useful only in a few
debugging scenarios, define a configuration option that disables them by
default (if enabled, it produces duplicate output which might be
confusing).

Implement early kernel debugging prints for the HiKey960.

Files:

• HelenOS.config (modified) (1 diff)
• kernel/arch/amd64/src/asm.S (modified) (2 diffs)
• kernel/arch/arm64/include/arch/machine_func.h (modified) (2 diffs)
• kernel/arch/arm64/src/arm64.c (modified) (2 diffs)
• kernel/arch/arm64/src/asm.S (modified) (1 diff)
• kernel/arch/arm64/src/mach/hikey960/hikey960.c (modified) (2 diffs)
• kernel/arch/arm64/src/machine_func.c (modified) (1 diff)
• kernel/arch/ia32/src/asm.S (modified) (1 diff)
• kernel/generic/src/console/console.c (modified) (1 diff)

HelenOS.config

@@ -396 +396 @@
 ! CONFIG_DEBUG (y/n)
 
+% Early debugging print
+! [CONFIG_DEBUG=y] CONFIG_DEBUG_EARLY_PRINT (n/y)
+
 % Sanitize undefined behavior (userspace)
 ! CONFIG_UBSAN (n/y)

kernel/arch/amd64/src/asm.S

@@ -411 +411 @@
 FUNCTION_BEGIN(early_putuchar)
 
+#if (defined(CONFIG_DEBUG_EARLY_PRINT))
+
 #if (defined(CONFIG_L4RE_UVMM_EARLY_PRINT))
         xorl %eax, %eax  /* RAX==0: uvmm's print hypercall */
@@ -543 +545 @@
 #endif
 
+#endif
+
         ret
 FUNCTION_END(early_putuchar)

kernel/arch/arm64/include/arch/machine_func.h

@@ -50 +50 @@
         size_t (*machine_get_irq_count)(void);
         const char *(*machine_get_platform_name)(void);
+        void (*machine_early_uart_output)(char32_t);
 };
 
@@ -60 +61 @@
 extern size_t machine_get_irq_count(void);
 extern const char *machine_get_platform_name(void);
+extern void machine_early_uart_output(char32_t);
 
 #endif

kernel/arch/arm64/src/arm64.c

@@ -40 +40 @@
 #include <arch/exception.h>
 #include <arch/machine_func.h>
+#include <console/console.h>
 #include <interrupt.h>
 #include <proc/scheduler.h>
@@ -256 +257 @@
 }
 
+void early_putuchar(char32_t c)
+{
+#ifdef CONFIG_DEBUG_EARLY_PRINT
+        if (c == '\n')
+                machine_early_uart_output('\r');
+
+        machine_early_uart_output(c);
+#endif
+}
+
 /** @}
  */

kernel/arch/arm64/src/asm.S

@@ -55 +55 @@
 FUNCTION_END(memcpy_from_uspace_failover_address)
 FUNCTION_END(memcpy_to_uspace_failover_address)
-
-FUNCTION_BEGIN(early_putuchar)
-        ret
-FUNCTION_END(early_putuchar)
 
 /** Flush instruction caches

kernel/arch/arm64/src/mach/hikey960/hikey960.c

@@ -122 +122 @@
 }
 
+static void hikey960_early_uart_output(char32_t c)
+{
+        volatile uint32_t *uartdr = (volatile uint32_t *)
+            PA2KA(HIKEY960_UART_ADDRESS);
+        volatile uint32_t *uartfr = (volatile uint32_t *)
+            PA2KA(HIKEY960_UART_ADDRESS + 24);
+
+        while (*uartfr & 0x20U) {
+        }
+
+        *uartdr = c;
+}
+
 struct arm_machine_ops hikey960_machine_ops = {
         hikey960_init,
@@ -129 +142 @@
         hikey960_enable_vtimer_irq,
         hikey960_get_irq_count,
-        hikey960_get_platform_name
+        hikey960_get_platform_name,
+        hikey960_early_uart_output
 };
 

kernel/arch/arm64/src/machine_func.c

@@ -101 +101 @@
 }
 
+/** Early debugging output. */
+void machine_early_uart_output(char32_t c)
+{
+        if (machine_ops->machine_early_uart_output != NULL)
+                machine_ops->machine_early_uart_output(c);
+}
+
 /** @}
  */

kernel/arch/ia32/src/asm.S

@@ -453 +453 @@
 FUNCTION_BEGIN(early_putuchar)
 
-#if ((defined(CONFIG_EGA)) && (!defined(CONFIG_FB)))
+#if ((defined(CONFIG_DEBUG_EARLY_PRINT)) && (defined(CONFIG_EGA)) && (!defined(CONFIG_FB)))
 
         /* Prologue, save preserved registers */

kernel/generic/src/console/console.c

@@ -379 +379 @@
                  * The early_putuchar() function is used to output
                  * the character for low-level debugging purposes.
-                 * Note that the early_putc() function might be
+                 * Note that the early_putuchar() function might be
                  * a no-op on certain hardware configurations.
                  */