Merge remote-tracking branch 'upstream/master'

sdk/xtdk/amd64/hltypes.h

@@ -83,6 +83,9 @@
 /* Serial port I/O addresses */
 #define COMPORT_ADDRESSES                               {0x000, 0x3F8, 0x2F8, 0x3E8, 0x2E8, 0x5F8, 0x4F8, 0x5E8, 0x4E8}
 
+/* Initial stall factor */
+#define INITIAL_STALL_FACTOR                            100
+
 /* APIC Base Register */
 typedef union _APIC_BASE_REGISTER
 {
@@ -131,4 +134,14 @@ typedef union _APIC_SPURIOUS_REGISTER
     };
 } APIC_SPURIOUS_REGISTER, *PAPIC_SPURIOUS_REGISTER;
 
+/* Processor identity structure */
+typedef struct _HAL_PROCESSOR_IDENTITY
+{
+    UCHAR ProcessorId;
+    UCHAR LApicId;
+    BOOLEAN Bsp;
+    BOOLEAN Started;
+    PKPROCESSOR_BLOCK ProcessorBlock;
+} HAL_PROCESSOR_IDENTITY, *PHAL_PROCESSOR_IDENTITY;
+
 #endif /* __XTDK_AMD64_HLTYPES_H */

sdk/xtdk/amd64/ketypes.h

@@ -550,6 +550,7 @@ typedef struct _KPROCESSOR_BLOCK
     KRUNLEVEL RunLevel;
     KPROCESSOR_CONTROL_BLOCK Prcb;
     ULONG ContextSwitches;
+    ULONG StallScaleFactor;
 } KPROCESSOR_BLOCK, *PKPROCESSOR_BLOCK;
 
 /* Thread Environment Block (TEB) structure definition */

sdk/xtdk/i686/hltypes.h

@@ -88,6 +88,9 @@
 /* Serial port I/O addresses */
 #define COMPORT_ADDRESSES                               {0x000, 0x3F8, 0x2F8, 0x3E8, 0x2E8, 0x5F8, 0x4F8, 0x5E8, 0x4E8}
 
+/* Initial stall factor */
+#define INITIAL_STALL_FACTOR                            100
+
 /* APIC Base Register */
 typedef union _APIC_BASE_REGISTER
 {
@@ -136,4 +139,14 @@ typedef union _APIC_SPURIOUS_REGISTER
     };
 } APIC_SPURIOUS_REGISTER, *PAPIC_SPURIOUS_REGISTER;
 
+/* Processor identity structure */
+typedef struct _HAL_PROCESSOR_IDENTITY
+{
+    UCHAR ProcessorId;
+    UCHAR LApicId;
+    BOOLEAN Bsp;
+    BOOLEAN Started;
+    PKPROCESSOR_BLOCK ProcessorBlock;
+} HAL_PROCESSOR_IDENTITY, *PHAL_PROCESSOR_IDENTITY;
+
 #endif /* __XTDK_I686_HLTYPES_H */

sdk/xtdk/i686/ketypes.h

@@ -483,6 +483,7 @@ typedef struct _KPROCESSOR_BLOCK
     PKTSS TssBase;
     KPROCESSOR_CONTROL_BLOCK Prcb;
     ULONG ContextSwitches;
+    ULONG StallScaleFactor;
 } KPROCESSOR_BLOCK, *PKPROCESSOR_BLOCK;
 
 /* Thread Environment Block (TEB) structure definition */

xtoskrnl/CMakeLists.txt

@@ -14,6 +14,7 @@ list(APPEND XTOSKRNL_SOURCE
     ${XTOSKRNL_SOURCE_DIR}/ar/${ARCH}/traps.c
     ${XTOSKRNL_SOURCE_DIR}/ex/rundown.c
     ${XTOSKRNL_SOURCE_DIR}/hl/cport.c
+    ${XTOSKRNL_SOURCE_DIR}/hl/cpu.c
     ${XTOSKRNL_SOURCE_DIR}/hl/efifb.c
     ${XTOSKRNL_SOURCE_DIR}/hl/globals.c
     ${XTOSKRNL_SOURCE_DIR}/hl/pic.c

xtoskrnl/hl/cpu.c

@@ -0,0 +1,47 @@
+/**
+ * PROJECT:         ExectOS
+ * COPYRIGHT:       See COPYING.md in the top level directory
+ * FILE:            xtoskrnl/hl/cpu.c
+ * DESCRIPTION:     HAL Processor support
+ * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
+ */
+
+#include <xtos.h>
+
+
+/**
+ * Initializes the processor.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTAPI
+VOID
+HlInitializeProcessor(VOID)
+{
+    PKPROCESSOR_BLOCK ProcessorBlock;
+    KAFFINITY Affinity;
+    ULONG CpuNumber = 0;
+
+    /* Get current processor block */
+    ProcessorBlock = KeGetCurrentProcessorBlock();
+
+    /* Set initial stall factor */
+    ProcessorBlock->StallScaleFactor = INITIAL_STALL_FACTOR;
+
+    /* Record processor block in the processors table */
+    HlpProcessorsIdentity[CpuNumber].ProcessorBlock = ProcessorBlock;
+
+    /* Set processor affinity */
+    Affinity = (KAFFINITY) 1 << CpuNumber;
+
+    /* Apply affinity to a set of processors */
+    HlpActiveProcessors |= Affinity;
+
+    /* Initialize APIC for this processor */
+    HlpInitializeApic();
+
+    /* Set the APIC running level */
+    HlSetRunLevel(KeGetCurrentProcessorBlock()->RunLevel);
+}

xtoskrnl/hl/globals.c

@@ -9,8 +9,14 @@
 #include <xtos.h>
 
 
+/* Active processors count */
+KAFFINITY HlpActiveProcessors;
+
 /* APIC mode */
 HAL_APIC_MODE HlpApicMode;
 
 /* FrameBuffer information */
 HAL_FRAMEBUFFER_DATA HlpFrameBufferData;
+
+/* Processors identity table */
+HAL_PROCESSOR_IDENTITY HlpProcessorsIdentity[MAXIMUM_PROCESSORS] = {{0}};

xtoskrnl/includes/globals.h

@@ -12,12 +12,18 @@
 #include <xtos.h>
 
 
+/* Active processors count */
+EXTERN KAFFINITY HlpActiveProcessors;
+
 /* APIC mode */
 EXTERN HAL_APIC_MODE HlpApicMode;
 
 /* FrameBuffer information */
 EXTERN HAL_FRAMEBUFFER_DATA HlpFrameBufferData;
 
+/* Processors identity table */
+EXTERN HAL_PROCESSOR_IDENTITY HlpProcessorsIdentity[MAXIMUM_PROCESSORS];
+
 /* Pointer to boot loader provided DbgPrint() routine */
 EXTERN VOID (*KeDbgPrint)(IN PWCHAR Format, IN ...);
 

xtoskrnl/includes/hl.h

@@ -105,6 +105,10 @@ XTAPI
 VOID
 HlpInitializeApic(VOID);
 
+XTAPI
+VOID
+HlInitializeProcessor(VOID);
+
 XTFASTCALL
 KRUNLEVEL
 HlpTransformApicTprToRunLevel(IN UCHAR Tpr);