stv0g/eduOS
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

support of high addresses by early printing via UART

Browse source
This commit is contained in:
Stefan Lankes 2014-12-29 12:18:55 +01:00
parent 211fa113f0
commit 87668dd5cc
2 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
arch/x86/kernel/uart.c
View file

@ -30,6 +30,7 @@
#include <eduos/string.h>
#include <eduos/mailbox.h>
#include <eduos/ctype.h>
#include <asm/page.h>
#include <asm/io.h>
#include <asm/page.h>
#include <asm/uart.h>
@ -252,6 +253,8 @@ static int uart_config(uint8_t early)
return 0;
}
extern const void kernel_start;
int uart_early_init(char* cmdline)
{
if (BUILTIN_EXPECT(!cmdline, 0))
@ -270,6 +273,21 @@ int uart_early_init(char* cmdline)
iobase = strtol(str+10, (char **)NULL, 16);
if (!iobase)
return -EINVAL;
if (iobase >= PAGE_MAP_ENTRIES*PAGE_SIZE) {
/* at this point we use the boot page table
* => IO address is not mapped
* => dirty hack, map device before the kernel
*/
int err;
size_t newaddr = ((size_t) &kernel_start - PAGE_SIZE);
err = page_map_bootmap(newaddr & PAGE_MASK, iobase & PAGE_MASK, PG_GLOBAL | PG_ACCESSED | PG_DIRTY | PG_RW | PG_PCD);
if (BUILTIN_EXPECT(err, 0)) {
iobase = 0;
return err;
}
iobase = newaddr;
}
mmio = 1;
}

9
libkern/stdio.c
View file

@ -120,14 +120,7 @@ int kputs(const char *str)
int koutput_add_uart(void)
{
#ifdef CONFIG_UART
if (!(early_print & UART_EARLY_PRINT)) {
uint32_t i;
early_print |= UART_EARLY_PRINT;
for(i=0; i<atomic_int32_read(&kmsg_counter); i++)
uart_putchar(kmessages[i % KMSG_SIZE]);
}
early_print |= UART_EARLY_PRINT;
return 0;
#else