Mirrors/libhermit
1
0
Fork 0
mirror of https://github.com/hermitcore/libhermit.git synced 2025-03-30 00:00:15 +01:00
Code Issues Releases Wiki Activity

use uart device to dump kernel messages

Browse source
This commit is contained in:
Stefan Lankes 2018-04-28 23:29:36 +00:00
parent 7a6efe3256
commit e6558c0b9b
3 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/aarch64/kernel/entry.S
View file

@ -123,6 +123,9 @@ hcmask: .byte 255,255,255,0
.global host_logical_addr .global host_logical_addr
host_logical_addr: .quad 0 host_logical_addr: .quad 0
.global uart_mmio
uart_mmio: .dword 0
start64: start64:
//mrs x0, s3_1_c15_c3_0 // Read EL1 Configuration Base Address Register //mrs x0, s3_1_c15_c3_0 // Read EL1 Configuration Base Address Register

21
arch/aarch64/kernel/uart.c
View file

@ -33,6 +33,7 @@
#include <asm/uart.h> #include <asm/uart.h>
volatile static unsigned int* mmio = NULL; volatile static unsigned int* mmio = NULL;
extern unsigned int uart_mmio;
/* Puts a single character on a serial device */ /* Puts a single character on a serial device */
int uart_putchar(unsigned char c) int uart_putchar(unsigned char c)
@ -59,21 +60,23 @@ int uart_puts(const char *text)
int uart_early_init(char* cmdline) int uart_early_init(char* cmdline)
{ {
if (is_uhyve()) if (is_uhyve()) {
return 0; mmio = (unsigned int*) uart_mmio;
} else {
// default value of our QEMU configuration // default value of our QEMU configuration
mmio = (unsigned int*) 0x09000000; mmio = (unsigned int*) 0x09000000;
}
return 0; return 0;
} }
int uart_init(void) int uart_init(void)
{ {
if (is_uhyve()) if (is_uhyve()) {
return 0; mmio = (unsigned int*) uart_mmio;
} else {
mmio = (unsigned int*) 0x09000000; mmio = (unsigned int*) 0x09000000;
}
return 0; return 0;
} }

2
tools/uhyve-aarch64.c
View file

@ -477,6 +477,8 @@ int load_kernel(uint8_t* mem, char* path)
} }
*((uint64_t*) (mem+paddr-GUEST_OFFSET + 0xbc)) = (uint64_t) guest_mem; *((uint64_t*) (mem+paddr-GUEST_OFFSET + 0xbc)) = (uint64_t) guest_mem;
if (verbose)
*((uint32_t*) (mem+paddr-GUEST_OFFSET + 0x174)) = (uint32_t) UHYVE_UART_PORT;
} }
*((uint64_t*) (mem+paddr-GUEST_OFFSET + 0x158)) += memsz; // total kernel size *((uint64_t*) (mem+paddr-GUEST_OFFSET + 0x158)) += memsz; // total kernel size
} }