Implement APIC

source/Cosmos.Core/INTs.cs

@@ -283,6 +283,7 @@ public static void SetIntHandler(byte aIntNo, IRQDelegate aHandler) {
         /// <param name="aIrqNo">IRQ index.</param>
         /// <param name="aHandler">IRQ handler.</param>
         public static void SetIrqHandler(byte aIrqNo, IRQDelegate aHandler) {
+            IOAPIC.SetEntry((uint)aIrqNo + 0x20);
             SetIntHandler((byte)(0x20 + aIrqNo), aHandler);
         }
 
@@ -303,13 +304,7 @@ private static void IRQ(uint irq, ref IRQContext aContext) {
         /// </summary>
         /// <param name="aContext">A IEQ context.</param>
         public static void HandleInterrupt_Default(ref IRQContext aContext) {
-            if (aContext.Interrupt >= 0x20 && aContext.Interrupt <= 0x2F) {
-                if (aContext.Interrupt >= 0x28) {
-                    Global.PIC.EoiSlave();
-                } else {
-                    Global.PIC.EoiMaster();
-                }
-            }
+            LocalAPIC.EndOfInterrupt();
         }
 
         /// <summary>
@@ -327,12 +322,12 @@ public static void HandleInterrupt_Default(ref IRQContext aContext) {
         #region Default Interrupt Handlers
 
         /// <summary>
-        /// IRQ 0 - System timer. Reserved for the system. Cannot be changed by a user.
+        /// IRQ 0 - System (APIC) timer. Reserved for the system. Cannot be changed by a user.
         /// </summary>
         /// <param name="aContext">IRQ context.</param>
         public static void HandleInterrupt_20(ref IRQContext aContext) {
             IRQ(0x20, ref aContext);
-            Global.PIC.EoiMaster();
+            LocalAPIC.EndOfInterrupt();
         }
 
         //public static IRQDelegate IRQ01;
@@ -343,43 +338,43 @@ public static void HandleInterrupt_20(ref IRQContext aContext) {
         public static void HandleInterrupt_21(ref IRQContext aContext) {
 
             IRQ(0x21, ref aContext);
-            Global.PIC.EoiMaster();
+            LocalAPIC.EndOfInterrupt();
         }
 
         public static void HandleInterrupt_22(ref IRQContext aContext) {
 
             IRQ(0x22, ref aContext);
-            Global.PIC.EoiMaster();
+            LocalAPIC.EndOfInterrupt();
         }
         public static void HandleInterrupt_23(ref IRQContext aContext) {
 
             IRQ(0x23, ref aContext);
-            Global.PIC.EoiMaster();
+            LocalAPIC.EndOfInterrupt();
         }
         public static void HandleInterrupt_24(ref IRQContext aContext) {
 
             IRQ(0x24, ref aContext);
-            Global.PIC.EoiMaster();
+            LocalAPIC.EndOfInterrupt();
         }
         public static void HandleInterrupt_25(ref IRQContext aContext) {
             IRQ(0x25, ref aContext);
-            Global.PIC.EoiMaster();
+            LocalAPIC.EndOfInterrupt();
         }
         public static void HandleInterrupt_26(ref IRQContext aContext) {
 
             IRQ(0x26, ref aContext);
-            Global.PIC.EoiMaster();
+            LocalAPIC.EndOfInterrupt();
         }
         public static void HandleInterrupt_27(ref IRQContext aContext) {
 
             IRQ(0x27, ref aContext);
-            Global.PIC.EoiMaster();
+            LocalAPIC.EndOfInterrupt();
         }
 
         public static void HandleInterrupt_28(ref IRQContext aContext) {
 
             IRQ(0x28, ref aContext);
-            Global.PIC.EoiSlave();
+            LocalAPIC.EndOfInterrupt();
         }
 
         /// <summary>
@@ -388,7 +383,7 @@ public static void HandleInterrupt_28(ref IRQContext aContext) {
         /// <param name="aContext">IRQ context.</param>
         public static void HandleInterrupt_29(ref IRQContext aContext) {
             IRQ(0x29, ref aContext);
-            Global.PIC.EoiSlave();
+            LocalAPIC.EndOfInterrupt();
         }
 
         /// <summary>
@@ -397,7 +392,7 @@ public static void HandleInterrupt_29(ref IRQContext aContext) {
         /// <param name="aContext">IRQ context.</param>
         public static void HandleInterrupt_2A(ref IRQContext aContext) {
             IRQ(0x2A, ref aContext);
-            Global.PIC.EoiSlave();
+            LocalAPIC.EndOfInterrupt();
         }
 
         /// <summary>
@@ -406,19 +401,26 @@ public static void HandleInterrupt_2A(ref IRQContext aContext) {
         /// <param name="aContext">IRQ context.</param>
         public static void HandleInterrupt_2B(ref IRQContext aContext) {
             IRQ(0x2B, ref aContext);
-            Global.PIC.EoiSlave();
+            LocalAPIC.EndOfInterrupt();
         }
 
+        /// <summary>
+        /// IRQ 12 - PS/2 Mouse. Reserved for the system.
+        /// </summary>
+        /// <param name="aContext">IRQ context.</param>
         public static void HandleInterrupt_2C(ref IRQContext aContext) {
 
             IRQ(0x2C, ref aContext);
-            Global.PIC.EoiSlave();
+            LocalAPIC.EndOfInterrupt();
         }
 
-
+        /// <summary>
+        /// IRQ 13 - (Added for PIT Timer).
+        /// </summary>
+        /// <param name="aContext">IRQ context.</param>
         public static void HandleInterrupt_2D(ref IRQContext aContext) {
             IRQ(0x2D, ref aContext);
-            Global.PIC.EoiSlave();
+            LocalAPIC.EndOfInterrupt();
         }
 
         /// <summary>
@@ -427,7 +429,7 @@ public static void HandleInterrupt_2D(ref IRQContext aContext) {
         /// <param name="aContext">IRQ context.</param>
         public static void HandleInterrupt_2E(ref IRQContext aContext) {
             IRQ(0x2E, ref aContext);
-            Global.PIC.EoiSlave();
+            LocalAPIC.EndOfInterrupt();
         }
 
         /// <summary>
@@ -436,7 +438,7 @@ public static void HandleInterrupt_2E(ref IRQContext aContext) {
         /// <param name="aContext">IRQ context.</param>
         public static void HandleInterrupt_2F(ref IRQContext aContext) {
             IRQ(0x2F, ref aContext);
-            Global.PIC.EoiSlave();
+            LocalAPIC.EndOfInterrupt();
         }
 
         public static event IRQDelegate Interrupt30;

source/Cosmos.Core/IOAPIC.cs

@@ -0,0 +1,110 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Cosmos.Core.MemoryGroup;
+
+namespace Cosmos.Core
+{
+    /// <summary>
+    /// Local APIC class.
+    /// </summary>
+    public unsafe partial class IOAPIC
+    {
+        public const byte IOREGSEL = 0x00;
+        public const byte IOWIN = 0x10;
+
+        //IO APIC Registers
+        public const byte IOAPICID = 0x00;
+        public const byte IOAPICVER = 0x01;
+        public const byte IOAPICARB = 0x02;
+        public const byte IOREDTBL = 0x10;
+
+        /// <summary>
+        /// IO APIC Base Address.
+        /// </summary>
+        private static uint Address = 0;
+
+        /// <summary>
+        /// Initialize local APIC.
+        /// </summary>
+        public static void Initialize()
+        {
+            if (ACPI.IOAPIC == null)
+            {
+                //TODO: Fix ACPI tables on Bochs
+                //No APIC detected, hardcode APIC address
+                Address = 0xFEC00000;
+            }
+            else
+            {
+                Address = ACPI.IOAPIC->IOApicAddress;
+            }
+
+            Global.debugger.Send("IO APIC address:0x" + Address.ToString("X"));
+
+            uint x = In(IOAPICVER);
+            uint count = ((x >> 16) & 0xFF) + 1;
+
+            Global.debugger.Send("IO APIC pins:" + count);
+
+            //Disable All Entries, Make all interrupts edge triggered and not routed to any CPUs
+            for (uint i = 0; i < count; ++i)
+            {
+                SetEntry((byte)i, (1 << 16) | 0x20 + i);
+            }
+
+            Global.debugger.Send("IO APIC " + GetId() + " Initialized");
+        }
+
+        /// <summary>
+        /// IO APIC MMIO Out.
+        /// </summary>
+        /// <param name="reg">IO APIC Register.</param>
+        /// <param name="val">Data.</param>
+        public static void Out(byte reg, uint val)
+        {
+            MMIOBase.Write32(Address + IOREGSEL, reg);
+            MMIOBase.Write32(Address + IOWIN, val);
+        }
+
+        /// <summary>
+        /// IO APIC MMIO In.
+        /// </summary>
+        /// <param name="reg">IO APIC Register.</param>
+        public static uint In(byte reg)
+        {
+            MMIOBase.Write32(Address + IOREGSEL, reg);
+            return MMIOBase.Read32(Address + IOWIN);
+        }
+
+        /// <summary>
+        /// Set IO APIC Entry.
+        /// </summary>
+        /// <param name="data">Irq ID.</param>
+        public static void SetEntry(uint irq)
+        {
+            SetEntry((byte)ACPI.RemapIRQ(irq - 0x20), irq);
+        }
+
+        /// <summary>
+        /// Set IO APIC Entry.
+        /// </summary>
+        /// <param name="data">Irq ID.</param>
+        public static void SetEntry(byte index, ulong data)
+        {
+            Out((byte)(IOREDTBL + index * 2), (uint)data);
+            Out((byte)(IOREDTBL + index * 2 + 1), (uint)(data >> 32));
+        }
+
+        /// <summary>
+        /// Get IO APIC ID.
+        /// </summary>
+        /// <returns>byte value.</returns>
+        public static byte GetId()
+        {
+            return (byte)((In(IOAPICID) >> 24) & 0xF0);
+        }
+    }
+}