kernel/acpi: discover local interrupt controllers

5 files changed, 100 insertions, 31 deletions

diff --git a/arch/x86_64/CMakeLists.txt b/arch/x86_64/CMakeLists.txt
index f77eec5..62a2aad 100644
--- a/arch/x86_64/CMakeLists.txt
+++ b/arch/x86_64/CMakeLists.txt
@@ -12,6 +12,7 @@ target_link_libraries("x86_64" PUBLIC
 
 target_sources("x86_64" PRIVATE
     # Platform-dependent KAPI implementation
+    "kapi/acpi.cpp"
     "kapi/boot_modules.cpp"
     "kapi/cio.cpp"
     "kapi/cpu.cpp"
@@ -40,6 +41,7 @@ target_sources("x86_64" PRIVATE
     # Devices
     "src/devices/init.cpp"
     "src/devices/legacy_pit.cpp"
+    "src/devices/local_apic.cpp"
 
     # Memory management
     "src/memory/kernel_mapper.cpp"
diff --git a/arch/x86_64/include/arch/devices/local_apic.hpp b/arch/x86_64/include/arch/devices/local_apic.hpp
new file mode 100644
index 0000000..71e9758
--- /dev/null
+++ b/arch/x86_64/include/arch/devices/local_apic.hpp
@@ -0,0 +1,26 @@
+#ifndef TEACHOS_ARCH_X86_64_DEVICES_LOCAL_APIC_HPP
+#define TEACHOS_ARCH_X86_64_DEVICES_LOCAL_APIC_HPP
+
+#include "kapi/devices/device.hpp"
+#include "kapi/memory.hpp"
+
+#include <cstddef>
+#include <cstdint>
+
+namespace arch::devices
+{
+
+  struct local_apic : kapi::devices::device
+  {
+    local_apic(std::size_t major, std::size_t minor, std::uint64_t hardware_id, kapi::memory::physical_address base);
+
+    auto init() -> bool override;
+
+  private:
+    std::uint64_t m_hardware_id{};
+    kapi::memory::physical_address m_base{};
+  };
+
+}  // namespace arch::devices
+
+#endif
\ No newline at end of file
diff --git a/arch/x86_64/kapi/acpi.cpp b/arch/x86_64/kapi/acpi.cpp
new file mode 100644
index 0000000..9766154
--- /dev/null
+++ b/arch/x86_64/kapi/acpi.cpp
@@ -0,0 +1,43 @@
+#include "kapi/acpi.hpp"
+
+#include "kapi/devices.hpp"
+#include "kapi/memory.hpp"
+
+#include "arch/boot/boot.hpp"
+#include "arch/devices/local_apic.hpp"
+
+#include <kstd/memory>
+
+#include <cstddef>
+#include <cstdint>
+
+namespace kapi::acpi
+{
+
+  auto get_root_pointer() -> kstd::observer_ptr<root_system_description_pointer const>
+  {
+    auto const & mbi = kapi::boot::bootstrap_information.mbi;
+    auto system_description_pointer = static_cast<kapi::acpi::root_system_description_pointer const *>(nullptr);
+
+    if (auto const & xsdp = mbi->maybe_acpi_xsdp())
+    {
+      auto data = xsdp->pointer().data();
+
+      system_description_pointer = reinterpret_cast<kapi::acpi::root_system_description_pointer const *>(data);
+    }
+    else if (auto const & rsdp = mbi->maybe_acpi_rsdp())
+    {
+      auto data = rsdp->pointer().data();
+      system_description_pointer = reinterpret_cast<kapi::acpi::root_system_description_pointer const *>(data);
+    }
+
+    return kstd::make_observer(system_description_pointer);
+  }
+
+  auto create_local_interrupt_controller(std::size_t major, std::size_t minor, std::uint64_t hardware_id,
+                                         memory::physical_address address) -> kstd::unique_ptr<devices::device>
+  {
+    return kstd::make_unique<arch::devices::local_apic>(major, minor, hardware_id, address);
+  }
+
+}  // namespace kapi::acpi
\ No newline at end of file
diff --git a/arch/x86_64/src/devices/init.cpp b/arch/x86_64/src/devices/init.cpp
index 1099ad6..6cba986 100644
--- a/arch/x86_64/src/devices/init.cpp
+++ b/arch/x86_64/src/devices/init.cpp
@@ -1,10 +1,7 @@
 #include "arch/devices/init.hpp"
 
-#include "kapi/acpi.hpp"
-#include "kapi/boot.hpp"
 #include "kapi/devices.hpp"
 
-#include "arch/boot/boot.hpp"
 #include "arch/bus/isa.hpp"
 #include "arch/devices/legacy_pit.hpp"
 
@@ -22,34 +19,7 @@ namespace arch::devices
     constexpr auto pit_frequency_in_hz = std::uint32_t{100u};
   }
 
-  auto init_acpi_devices() -> void
-  {
-    auto const & mbi = kapi::boot::bootstrap_information.mbi;
-    auto system_description_pointer = static_cast<kapi::acpi::root_system_description_pointer const *>(nullptr);
-
-    if (auto const & xsdp = mbi->maybe_acpi_xsdp())
-    {
-      auto data = xsdp->pointer().data();
-      system_description_pointer = reinterpret_cast<kapi::acpi::root_system_description_pointer const *>(data);
-    }
-    else if (auto const & rsdp = mbi->maybe_acpi_rsdp())
-    {
-      auto data = rsdp->pointer().data();
-      system_description_pointer = reinterpret_cast<kapi::acpi::root_system_description_pointer const *>(data);
-    }
-
-    if (system_description_pointer)
-    {
-      if (!kapi::acpi::init(*system_description_pointer))
-      {
-        kstd::println(kstd::print_sink::stderr, "[x86_64:DEV] ACPI initialization failed. No tables loaded.");
-      }
-    }
-    else
-    {
-      kstd::println(kstd::print_sink::stderr, "[x86_64:DEV] No ACPI RSDP found. Most devices will not be available.");
-    }
-  }
+  auto init_acpi_devices() -> void {}
 
   auto init_legacy_devices() -> void
   {
diff --git a/arch/x86_64/src/devices/local_apic.cpp b/arch/x86_64/src/devices/local_apic.cpp
new file mode 100644
index 0000000..beb75ef
--- /dev/null
+++ b/arch/x86_64/src/devices/local_apic.cpp
@@ -0,0 +1,28 @@
+#include "arch/devices/local_apic.hpp"
+
+#include "kapi/devices.hpp"
+#include "kapi/memory.hpp"
+
+#include <kstd/print>
+
+#include <cstddef>
+#include <cstdint>
+
+namespace arch::devices
+{
+
+  local_apic::local_apic(std::size_t major, std::size_t minor, std::uint64_t hardware_id,
+                         kapi::memory::physical_address base)
+      : kapi::devices::device{major, minor, "lapic"}
+      , m_hardware_id{hardware_id}
+      , m_base{base}
+  {}
+
+  auto local_apic::init() -> bool
+  {
+    kstd::println("[x86_64:DEV] Initializing local APIC on core {}", m_hardware_id);
+
+    return true;
+  }
+
+}  // namespace arch::devices
\ No newline at end of file