[ros-diffs] [ros-arm-bringup] 32323: Write initialization code in assembly -- we load the kernel stack from FreeLDR and jump to C code. We now have a file for C-code initialization (no reason to use assembly). We now have some basic TLB routines and intrinsics (not tested). We also detect if we are running on V4 or V6, and set the TLB and ASID counts respectively.
ros-arm-bringup at svn.reactos.org
ros-arm-bringup at svn.reactos.org
Tue Feb 12 17:22:02 CET 2008
Author: ros-arm-bringup
Date: Tue Feb 12 19:22:01 2008
New Revision: 32323
URL: http://svn.reactos.org/svn/reactos?rev=32323&view=rev
Log:
Write initialization code in assembly -- we load the kernel stack from FreeLDR and jump to C code.
We now have a file for C-code initialization (no reason to use assembly).
We now have some basic TLB routines and intrinsics (not tested).
We also detect if we are running on V4 or V6, and set the TLB and ASID counts respectively.
Added:
trunk/reactos/ntoskrnl/ke/arm/kiinit.c (with props)
Modified:
trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h
trunk/reactos/ntoskrnl/include/internal/arm/ke.h
trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h
trunk/reactos/ntoskrnl/ke/arm/boot.s
trunk/reactos/ntoskrnl/ntoskrnl.rbuild
Modified: trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h?rev=32323&r1=32322&r2=32323&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h (original)
+++ trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h Tue Feb 12 19:22:01 2008
@@ -26,6 +26,15 @@
{
ARM_ID_CODE_REGISTER Value;
__asm__ __volatile__ ("mrc p15, 0, %0, c0, c0, 0" : "=r"(Value.AsUlong) : : "cc");
+ return Value;
+}
+
+FORCEINLINE
+ARM_LOCKDOWN_REGISTER
+KeArmLockdownRegisterGet(VOID)
+{
+ ARM_LOCKDOWN_REGISTER Value;
+ __asm__ __volatile__ ("mrc p15, 0, %0, c10, c0, 0" : "=r"(Value.AsUlong) : : "cc");
return Value;
}
@@ -61,4 +70,26 @@
__asm__ __volatile__ ("mcr p15, 0, %0, c3, c0, 0" : : "r"(DomainRegister.AsUlong) : "cc");
}
+FORCEINLINE
+VOID
+KeArmLockdownRegisterSet(IN ARM_LOCKDOWN_REGISTER LockdownRegister)
+{
+ __asm__ __volatile__ ("mcr p15, 0, %0, c10, c0, 0" : : "r"(LockdownRegister.AsUlong) : "cc");
+}
+
+FORCEINLINE
+VOID
+KeArmFlushTlb(VOID)
+{
+ __asm__ __volatile__ ("mcr p15, 0, %0, c8, c7, 0" : : "r"(0) : "cc");
+}
+
+FORCEINLINE
+VOID
+KeArmInvalidateTlbEntry(IN PVOID Address)
+{
+ __asm__ __volatile__ ("mcr p15, 0, %0, c8, c7, 1" : : "r"(Address) : "cc");
+}
+
+
#endif
Modified: trunk/reactos/ntoskrnl/include/internal/arm/ke.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/arm/ke.h?rev=32323&r1=32322&r2=32323&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/arm/ke.h (original)
+++ trunk/reactos/ntoskrnl/include/internal/arm/ke.h Tue Feb 12 19:22:01 2008
@@ -99,6 +99,18 @@
ULONG AsUlong;
} ARM_CACHE_REGISTER, *PARM_CACHE_REGISTER;
+typedef union _ARM_LOCKDOWN_REGISTER
+{
+ struct
+ {
+ ULONG Preserve:1;
+ ULONG Ignored:25;
+ ULONG Victim:3;
+ ULONG Reserved:3;
+ };
+ ULONG AsUlong;
+} ARM_LOCKDOWN_REGISTER, *PARM_LOCKDOWN_REGISTER;
+
typedef enum _ARM_DOMAINS
{
Domain0,
Modified: trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h?rev=32323&r1=32322&r2=32323&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h (original)
+++ trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h Tue Feb 12 19:22:01 2008
@@ -1,9 +1,31 @@
+//
+// CPSR Values
+//
.equ CPSR_IRQ_DISABLE, 0x80
.equ CPSR_FIQ_DISABLE, 0x40
.equ CPSR_THUMB_ENABLE, 0x20
+//
+// C1 Register Values
+//
.equ C1_MMU_CONTROL, 0x01
.equ C1_ALIGNMENT_CONTROL, 0x02
.equ C1_DCACHE_CONTROL, 0x04
.equ C1_ICACHE_CONTROL, 0x1000
.equ C1_VECTOR_CONTROL, 0x2000
+
+//
+// Loader Parameter Block Offsets
+//
+.equ LpbKernelStack, 0x18
+
+//
+// PCR
+//
+.equ KiPcr, 0xFFFFF000
+
+//
+// Lockdown TLB entries
+//
+.equ PCR_ENTRY 0
+.equ PDR_ENTRY 2
Modified: trunk/reactos/ntoskrnl/ke/arm/boot.s
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/boot.s?rev=32323&r1=32322&r2=32323&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/ke/arm/boot.s (original)
+++ trunk/reactos/ntoskrnl/ke/arm/boot.s Tue Feb 12 19:22:01 2008
@@ -15,8 +15,13 @@
PROLOG_END KiSystemStartup
//
- // Do stuff!
+ // Switch to boot kernel stack
//
- b .
+ ldr sp, [a2, #LpbKernelStack]
+
+ //
+ // Go to C code
+ //
+ b KiInitializeSystem
ENTRY_END KiSystemStartup
Added: trunk/reactos/ntoskrnl/ke/arm/kiinit.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/kiinit.c?rev=32323&view=auto
==============================================================================
--- trunk/reactos/ntoskrnl/ke/arm/kiinit.c (added)
+++ trunk/reactos/ntoskrnl/ke/arm/kiinit.c Tue Feb 12 19:22:01 2008
@@ -1,0 +1,128 @@
+/*
+ * PROJECT: ReactOS Kernel
+ * LICENSE: GPL - See COPYING in the top level directory
+ * FILE: ntoskrnl/ke/arm/kiinit.c
+ * PURPOSE: Implements the kernel entry point for ARM machines
+ * PROGRAMMERS: ReactOS Portable Systems Group
+ */
+
+/* INCLUDES *******************************************************************/
+
+#include <ntoskrnl.h>
+#define NDEBUG
+#include <debug.h>
+
+/* GLOBALS ********************************************************************/
+
+BOOLEAN KeIsArmV6;
+ULONG KeFixedTbEntries;
+ULONG KeNumberProcessIds;
+ULONG KeNumberTbEntries;
+
+#define __ARMV6__ KeIsArmV6
+
+/* FUNCTIONS ******************************************************************/
+
+VOID
+KiFlushSingleTb(IN BOOLEAN Invalid,
+ IN PVOID Virtual)
+{
+ //
+ // Just invalidate it
+ //
+ KeArmInvalidateTlbEntry(Virtual);
+}
+
+VOID
+KeFillFixedEntryTb(IN ARM_PTE Pte,
+ IN PVOID Virtual,
+ IN ULONG Index)
+{
+ ARM_LOCKDOWN_REGISTER LockdownRegister;
+ ULONG OldVictimCount;
+ ULONG Temp;
+ UNREFERENCED_PARAMETER(Pte);
+ UNREFERENCED_PARAMETER(Index);
+
+ //
+ // On ARM, we can't set the index ourselves, so make sure that we are not
+ // locking down more than 8 entries.
+ //
+ KeFixedTbEntries++;
+ ASSERT(KeFixedTbEntries <= 8);
+
+ //
+ // Flush the address
+ //
+ KiFlushSingleTb(TRUE, Virtual);
+
+ //
+ // Read lockdown register and set the preserve bit
+ //
+ LockdownRegister = KeArmLockdownRegisterGet();
+ LockdownRegister.Preserve = TRUE;
+ OldVictimCount = LockdownRegister.Victim;
+ KeArmLockdownRegisterSet(LockdownRegister);
+
+ //
+ // Now force a miss
+ //
+ Temp = *(PULONG)Virtual;
+
+ //
+ // Read lockdown register and clear the preserve bit
+ //
+ LockdownRegister = KeArmLockdownRegisterGet();
+ LockdownRegister.Preserve = FALSE;
+ ASSERT(LockdownRegister.Victim == OldVictimCount + 1);
+ KeArmLockdownRegisterSet(LockdownRegister);
+}
+
+VOID
+KeFlushTb(VOID)
+{
+ //
+ // Flush the entire TLB
+ //
+ KeArmFlushTlb();
+}
+
+VOID
+KiInitializeSystem(IN ULONG Magic,
+ IN PLOADER_PARAMETER_BLOCK LoaderBlock)
+{
+ //
+ // Detect ARM version (Architecture 6 is the ARMv5TE-J, go figure!)
+ //
+ KeIsArmV6 = KeArmIdCodeRegisterGet().Architecture == 7;
+
+ //
+ // Set the number of TLB entries and ASIDs
+ //
+ KeNumberTbEntries = 64;
+ if (__ARMV6__)
+ {
+ //
+ // 256 ASIDs on v6/v7
+ //
+ KeNumberProcessIds = 256;
+ }
+ else
+ {
+ //
+ // The TLB is VIVT on v4/v5
+ //
+ KeNumberProcessIds = 0;
+ }
+
+ //
+ // Flush the TLB
+ //
+ KeFlushTb();
+
+ //
+ //
+ //
+
+ while (TRUE);
+}
Propchange: trunk/reactos/ntoskrnl/ke/arm/kiinit.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/ntoskrnl/ke/arm/kiinit.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?rev=32323&r1=32322&r2=32323&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original)
+++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Tue Feb 12 19:22:01 2008
@@ -60,6 +60,7 @@
<if property="ARCH" value="arm">
<directory name="arm">
<file first="true">boot.s</file>
+ <file>kiinit.c</file>
<file>stubs_asm.s</file>
<file>stubs.c</file>
</directory>
More information about the Ros-diffs
mailing list