From b8a06afb8c9fb897b62ba1da10ee6a3991583b46 Mon Sep 17 00:00:00 2001 From: ReactOS Portable Systems Group Date: Tue, 12 Feb 2008 17:45:58 +0000 Subject: [PATCH] Added arm_kprintf() for early kernel debugging (ARM bringup). Freeldr maps the "Versatile"'s serial port into virtual memory now, and C code can just use arm_kprintf(). This is not code that is supposed to remain in the kernel, it's only needed for bringup, until enough is working so that standard serial DbgPrint() works through the original code path. svn path=/trunk/; revision=32327 --- .../boot/freeldr/freeldr/arch/arm/loader.c | 14 ++++ reactos/drivers/base/kdcom/kdbg.c | 1 + reactos/drivers/base/kdcom/kdcom.rbuild | 2 +- reactos/drivers/base/kdcom/kdcom_arm.def | 24 ++++++ .../base/kdcom/{kdcom.def => kdcom_i386.def} | 0 reactos/ntoskrnl/ke/arm/arm_kprintf.c | 84 +++++++++++++++++++ reactos/ntoskrnl/ke/arm/kiinit.c | 3 + reactos/ntoskrnl/ntoskrnl.rbuild | 1 + 8 files changed, 128 insertions(+), 1 deletion(-) create mode 100644 reactos/drivers/base/kdcom/kdcom_arm.def rename reactos/drivers/base/kdcom/{kdcom.def => kdcom_i386.def} (100%) create mode 100644 reactos/ntoskrnl/ke/arm/arm_kprintf.c diff --git a/reactos/boot/freeldr/freeldr/arch/arm/loader.c b/reactos/boot/freeldr/freeldr/arch/arm/loader.c index e922b62ad36..23809d39c16 100644 --- a/reactos/boot/freeldr/freeldr/arch/arm/loader.c +++ b/reactos/boot/freeldr/freeldr/arch/arm/loader.c @@ -47,6 +47,11 @@ ULONG LenBits[] = 8 // 8 words per line (32 bytes) }; +// +// Where to map the serial port +// +#define UART_VIRTUAL 0xC0000000 + /* FUNCTIONS ******************************************************************/ VOID @@ -116,6 +121,12 @@ ArmSetupPageDirectory(VOID) // Pte.L1.Section.BaseAddress = 0; TranslationTable->Pte[0] = Pte; + + // + // Map the page in MMIO space that contains the serial port into virtual memory + // + Pte.L1.Section.BaseAddress = ArmBoardBlock->UartRegisterBase >> TTB_SHIFT; + TranslationTable->Pte[UART_VIRTUAL >> TTB_SHIFT] = Pte; } VOID @@ -132,6 +143,9 @@ ArmSetupPagingAndJump(IN ULONG Magic) ControlRegister.DCacheEnabled = TRUE; KeArmControlRegisterSet(ControlRegister); + ArmBoardBlock->UartRegisterBase = UART_VIRTUAL | (ArmBoardBlock->UartRegisterBase & ((1<UartRegisterBase); + // // Jump to Kernel // diff --git a/reactos/drivers/base/kdcom/kdbg.c b/reactos/drivers/base/kdcom/kdbg.c index 20f92020b78..b07de7ca825 100644 --- a/reactos/drivers/base/kdcom/kdbg.c +++ b/reactos/drivers/base/kdcom/kdbg.c @@ -18,6 +18,7 @@ #include "arc/arc.h" #include "windbgkd.h" #include +#include /* port intrinsics */ typedef struct _KD_PORT_INFORMATION { diff --git a/reactos/drivers/base/kdcom/kdcom.rbuild b/reactos/drivers/base/kdcom/kdcom.rbuild index 8d079626923..82ce32b4b55 100644 --- a/reactos/drivers/base/kdcom/kdcom.rbuild +++ b/reactos/drivers/base/kdcom/kdcom.rbuild @@ -1,7 +1,7 @@ - + . ntoskrnl diff --git a/reactos/drivers/base/kdcom/kdcom_arm.def b/reactos/drivers/base/kdcom/kdcom_arm.def new file mode 100644 index 00000000000..20cb3755f96 --- /dev/null +++ b/reactos/drivers/base/kdcom/kdcom_arm.def @@ -0,0 +1,24 @@ +LIBRARY kdcom.dll +EXPORTS + +; Old KD +KdPortGetByte +KdPortGetByteEx +KdPortInitialize +KdPortInitializeEx +KdPortPollByte +KdPortPollByteEx +KdPortPutByte +KdPortPutByteEx +KdPortRestore +KdPortSave +KdPortDisableInterrupts +KdPortEnableInterrupts + +; New KD +KdDebuggerInitialize0 +KdDebuggerInitialize1 +KdSave +KdRestore +KdReceivePacket +KdSendPacket diff --git a/reactos/drivers/base/kdcom/kdcom.def b/reactos/drivers/base/kdcom/kdcom_i386.def similarity index 100% rename from reactos/drivers/base/kdcom/kdcom.def rename to reactos/drivers/base/kdcom/kdcom_i386.def diff --git a/reactos/ntoskrnl/ke/arm/arm_kprintf.c b/reactos/ntoskrnl/ke/arm/arm_kprintf.c new file mode 100644 index 00000000000..af68c618ff6 --- /dev/null +++ b/reactos/ntoskrnl/ke/arm/arm_kprintf.c @@ -0,0 +1,84 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ke/arm/arm_kprintf.c + * PURPOSE: Early serial printf-style kernel debugging (ARM bringup) + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include +#define NDEBUG +#include + +/* GLOBALS ********************************************************************/ + +// +// UART Registers +// +#define UART_BASE (void*)0xc00f1000 /* HACK: freeldr mapped it here */ + +#define UART_PL01x_DR (UART_BASE + 0x00) +#define UART_PL01x_RSR (UART_BASE + 0x04) +#define UART_PL01x_ECR (UART_BASE + 0x04) +#define UART_PL01x_FR (UART_BASE + 0x18) +#define UART_PL011_IBRD (UART_BASE + 0x24) +#define UART_PL011_FBRD (UART_BASE + 0x28) +#define UART_PL011_LCRH (UART_BASE + 0x2C) +#define UART_PL011_CR (UART_BASE + 0x30) +#define UART_PL011_IMSC (UART_BASE + 0x38) + +// +// LCR Values +// +#define UART_PL011_LCRH_WLEN_8 0x60 +#define UART_PL011_LCRH_FEN 0x10 + +// +// FCR Values +// +#define UART_PL011_CR_UARTEN 0x01 +#define UART_PL011_CR_TXE 0x100 +#define UART_PL011_CR_RXE 0x200 + +// +// LSR Values +// +#define UART_PL01x_FR_RXFE 0x10 +#define UART_PL01x_FR_TXFF 0x20 + +#define READ_REGISTER_ULONG(r) (*(volatile ULONG * const)(r)) +#define WRITE_REGISTER_ULONG(r, v) (*(volatile ULONG *)(r) = (v)) + +/* FUNCTIONS ******************************************************************/ + +VOID +ArmVersaPutChar(IN INT Char) +{ + // + // Properly support new-lines + // + if (Char == '\n') ArmVersaPutChar('\r'); + + // + // Wait for ready + // + while ((READ_REGISTER_ULONG(UART_PL01x_FR) & UART_PL01x_FR_TXFF) != 0); + + // + // Send the character + // + WRITE_REGISTER_ULONG(UART_PL01x_DR, Char); +} + +void arm_kprintf(const char *fmt, ...) { + char buf[1024], *s; + va_list args; + + va_start(args, fmt); + _vsnprintf(buf,sizeof(buf),fmt,args); + va_end(args); + for (s = buf; *s; s++) + ArmVersaPutChar(*s); +} diff --git a/reactos/ntoskrnl/ke/arm/kiinit.c b/reactos/ntoskrnl/ke/arm/kiinit.c index 388b90df4f0..5c5babec4fc 100644 --- a/reactos/ntoskrnl/ke/arm/kiinit.c +++ b/reactos/ntoskrnl/ke/arm/kiinit.c @@ -12,6 +12,8 @@ #define NDEBUG #include +void arm_kprintf(const char *fmt, ...); + /* GLOBALS ********************************************************************/ BOOLEAN KeIsArmV6; @@ -91,6 +93,7 @@ VOID KiInitializeSystem(IN ULONG Magic, IN PLOADER_PARAMETER_BLOCK LoaderBlock) { + arm_kprintf("%s:%i\n", __func__, __LINE__); // // Detect ARM version (Architecture 6 is the ARMv5TE-J, go figure!) // diff --git a/reactos/ntoskrnl/ntoskrnl.rbuild b/reactos/ntoskrnl/ntoskrnl.rbuild index 020affa69dc..c425aaa56bd 100644 --- a/reactos/ntoskrnl/ntoskrnl.rbuild +++ b/reactos/ntoskrnl/ntoskrnl.rbuild @@ -60,6 +60,7 @@ boot.s + arm_kprintf.c kiinit.c stubs_asm.s stubs.c