Changeset 508 for Whitix/branches/smp

Timestamp:

05/18/08 18:04:29 (4 years ago)

Author:

mwhitworth

Message:

Add APIC framework.

Files:

• Whitix/branches/smp/arch/i386/kernel/smp.c (modified) (5 diffs)

Whitix/branches/smp/arch/i386/kernel/smp.c

@@ -26 +26 @@
 
 int numProcessors=0;
+DWORD apicAddr;
 
 struct MpConfig;
@@ -158 +159 @@
 void SmpReadProcessorConfig(struct MpProcessorConfig* config)
 {
-        printf("SMP: CPU%d present\n", numProcessors);
+        printf("SMP: CPU%d present\n", config->apicId);
         
         numProcessors++;
@@ -207 +208 @@
         
         printf("SMP: APIC at %#X\n", mpConfig->apicAddress);
+        apicAddr=mpConfig->apicAddress;
         
         /* Now process the blocks after the structure. */
         while (offset < mpConfig->length)
         {
-                printf("(%#X %u %u %u) ", tables, offset, *tables, mpConfig->length);
+//              printf("(%#X %u %u %u) ", tables, offset, *tables, mpConfig->length);
                 switch (*tables)
                 {
@@ -247 +249 @@
 }
 
+void ApicMap()
+{
+        /* Do a one-to-one physical mapping of the APIC. */
+        VirtMemMapPage(apicAddr, apicAddr, 3);
+}
+
+int ApicVerify()
+{
+        /* TODO */
+        return 0;
+}
+
 int SmpInit()
 {
@@ -257 +271 @@
         printf("SMP: Intel MultiProcessor Specification V1.%u\n", floatingTable->version);
         
-        return SmpReadConfig(floatingTable->config);
-}
+        if (SmpReadConfig(floatingTable->config))
+        {
+                printf("SMP: Failed to read configuration.\n");
+                return 0;
+        }
+        
+        ApicMap();
+        
+        /* Verify the local APIC of the boot processor exists. */
+        ApicVerify();
+        
+        
+        
+        return 0;
+}