diff --git a/arch/x86_64/acpi/local_apic.cpp b/arch/x86_64/acpi/local_apic.cpp index 5f551af..e69de29 100644 --- a/arch/x86_64/acpi/local_apic.cpp +++ b/arch/x86_64/acpi/local_apic.cpp @@ -1,75 +0,0 @@ -#include -#include -#include -#include - -#define LAPIC_REG_EOI 0xB0 - -namespace arch::acpi { -static local_apic lapic; - -local_apic::local_apic(uint32_t *base) : base_(base) -{ -} - -kern_status_t local_apic::find(struct acpi_madt *madt, local_apic& out) -{ - phys_addr_t local_apic = madt->m_lapic_ptr; - - unsigned char *p = (unsigned char *)madt + sizeof *madt; - unsigned char *madt_end = (unsigned char *)madt + madt->m_base.s_length; - - while (p < madt_end) { - struct acpi_madt_record *rec = (struct acpi_madt_record *)p; - struct lapic_override_record *lapic; - - switch (rec->r_type) { - case ACPI_MADT_LAPIC_OVERRIDE: - lapic = (struct lapic_override_record *)(rec + 1); - out.base_ = (uint32_t *)vm_phys_to_virt(lapic->l_lapic_ptr); - return KERN_OK; - default: - break; - } - - p += rec->r_length; - } - - out.base_ = (uint32_t *)vm_phys_to_virt(local_apic); - return KERN_OK; -} - -uint32_t local_apic::read(uint32_t reg) -{ - return read_once(base_ + (reg >> 2)); -} - -void local_apic::write(uint32_t reg, uint32_t val) -{ - write_once(base_ + (reg >> 2), val); -} - -void local_apic::ack() -{ - write(LAPIC_REG_EOI, 0); -} - -void local_apic::send_ipi(unsigned int dest, unsigned int data) -{ - uint32_t dest_val = (read(IPI_DEST) & 0x00FFFFFF) | (dest << 24); - write(IPI_STATUS, 0); - write(IPI_DEST, dest_val); - - uint32_t icr_val = (read(IPI_ICR) & 0xFFF00000) | data; - write(IPI_ICR, icr_val); - - do { - __asm__ __volatile__("pause" : : : "memory"); - } while (read(IPI_ICR) & (1 << 12)); -} - -local_apic& local_apic::get(void) -{ - return lapic; -} -} diff --git a/arch/x86_64/init.c b/arch/x86_64/init.c index 0f25119..37f6a4c 100644 --- a/arch/x86_64/init.c +++ b/arch/x86_64/init.c @@ -15,7 +15,10 @@ #include #include #include + +#ifdef KEXT_NET_DOORSTUCK_SOCKS_ACPI #include +#endif #define PTR32(x) ((void *)((uintptr_t)(x))) @@ -85,6 +88,12 @@ static void init_bootfb(multiboot_info_t *mb) __bootfb_fixedinfo.fb_baseptr = mb->framebuffer_addr; } +static void use_uniprocessor_topology(void) +{ + cpu_set_available(0); + cpu_set_online(0); +} + int ml_init(uintptr_t arg) { multiboot_info_t *mb = (multiboot_info_t *)arg; @@ -105,7 +114,12 @@ int ml_init(uintptr_t arg) pmap_bootstrap(); +#ifdef KEXT_NET_DOORSTUCK_SOCKS_ACPI acpi_scan_cpu_topology(); +#else + use_uniprocessor_topology(); +#endif + init_per_cpu_areas(); struct cpu_data *this_cpu = get_this_cpu(); @@ -129,7 +143,10 @@ int ml_init(uintptr_t arg) sched_init(); device_init(); + +#ifdef KEXT_NET_DOORSTUCK_SOCKS_ACPI acpi_init(); +#endif ml_int_enable(); diff --git a/arch/x86_64/irq.c b/arch/x86_64/irq.c index eacb570..f4a5460 100644 --- a/arch/x86_64/irq.c +++ b/arch/x86_64/irq.c @@ -1,6 +1,5 @@ #include #include -#include #include #include #include @@ -9,6 +8,10 @@ #include #include +#ifdef KEXT_NET_DOORSTUCK_SOCKS_ACPI +#include +#endif + #define MAX_ISR_HANDLERS 16 extern void syscall_gate(); @@ -136,6 +139,17 @@ void isr_dispatch(struct cpu_context *regs) } } +#ifndef KEXT_NET_DOORSTUCK_SOCKS_ACPI +void irq_ack(unsigned int vec) +{ + if (vec >= 40) { + outportb(0xA0, 0x20); + } + + outportb(0x20, 0x20); +} +#endif + void irq_dispatch(struct cpu_context *regs) { end_charge_period(); diff --git a/arch/x86_64/acpi/acpi.c b/kexts/drivers/bus/acpi/acpi.c similarity index 100% rename from arch/x86_64/acpi/acpi.c rename to kexts/drivers/bus/acpi/acpi.c diff --git a/arch/x86_64/acpi/ap_trampoline.S b/kexts/drivers/bus/acpi/ap_trampoline.S similarity index 100% rename from arch/x86_64/acpi/ap_trampoline.S rename to kexts/drivers/bus/acpi/ap_trampoline.S diff --git a/arch/x86_64/acpi/apic.cpp b/kexts/drivers/bus/acpi/apic.cpp similarity index 100% rename from arch/x86_64/acpi/apic.cpp rename to kexts/drivers/bus/acpi/apic.cpp diff --git a/arch/x86_64/acpi/apic_ctrl.S b/kexts/drivers/bus/acpi/apic_ctrl.S similarity index 100% rename from arch/x86_64/acpi/apic_ctrl.S rename to kexts/drivers/bus/acpi/apic_ctrl.S diff --git a/kexts/drivers/bus/acpi/extension.yaml b/kexts/drivers/bus/acpi/extension.yaml new file mode 100644 index 0000000..e52d41a --- /dev/null +++ b/kexts/drivers/bus/acpi/extension.yaml @@ -0,0 +1,15 @@ +name: acpi +description: | + ACPI bus and SMP driver. +id: net.doorstuck.socks.acpi +license: BSD-3-Clause +copyright: Copyright © Max Wash 2023 +sources: + - acpi.c + - apic_ctrl.S + - local_apic.cpp + - smp.cpp + - apic.cpp + - ap_trampoline.S + - io_apic.cpp + - rsdp.c diff --git a/arch/x86_64/include/arch/acpi.h b/kexts/drivers/bus/acpi/include/arch/acpi.h similarity index 100% rename from arch/x86_64/include/arch/acpi.h rename to kexts/drivers/bus/acpi/include/arch/acpi.h diff --git a/arch/x86_64/include/arch/acpi/io_apic.hpp b/kexts/drivers/bus/acpi/include/arch/acpi/io_apic.hpp similarity index 100% rename from arch/x86_64/include/arch/acpi/io_apic.hpp rename to kexts/drivers/bus/acpi/include/arch/acpi/io_apic.hpp diff --git a/arch/x86_64/include/arch/acpi/local_apic.hpp b/kexts/drivers/bus/acpi/include/arch/acpi/local_apic.hpp similarity index 100% rename from arch/x86_64/include/arch/acpi/local_apic.hpp rename to kexts/drivers/bus/acpi/include/arch/acpi/local_apic.hpp diff --git a/arch/x86_64/acpi/io_apic.cpp b/kexts/drivers/bus/acpi/io_apic.cpp similarity index 100% rename from arch/x86_64/acpi/io_apic.cpp rename to kexts/drivers/bus/acpi/io_apic.cpp diff --git a/kexts/drivers/bus/acpi/local_apic.cpp b/kexts/drivers/bus/acpi/local_apic.cpp new file mode 100644 index 0000000..5f551af --- /dev/null +++ b/kexts/drivers/bus/acpi/local_apic.cpp @@ -0,0 +1,75 @@ +#include +#include +#include +#include + +#define LAPIC_REG_EOI 0xB0 + +namespace arch::acpi { +static local_apic lapic; + +local_apic::local_apic(uint32_t *base) : base_(base) +{ +} + +kern_status_t local_apic::find(struct acpi_madt *madt, local_apic& out) +{ + phys_addr_t local_apic = madt->m_lapic_ptr; + + unsigned char *p = (unsigned char *)madt + sizeof *madt; + unsigned char *madt_end = (unsigned char *)madt + madt->m_base.s_length; + + while (p < madt_end) { + struct acpi_madt_record *rec = (struct acpi_madt_record *)p; + struct lapic_override_record *lapic; + + switch (rec->r_type) { + case ACPI_MADT_LAPIC_OVERRIDE: + lapic = (struct lapic_override_record *)(rec + 1); + out.base_ = (uint32_t *)vm_phys_to_virt(lapic->l_lapic_ptr); + return KERN_OK; + default: + break; + } + + p += rec->r_length; + } + + out.base_ = (uint32_t *)vm_phys_to_virt(local_apic); + return KERN_OK; +} + +uint32_t local_apic::read(uint32_t reg) +{ + return read_once(base_ + (reg >> 2)); +} + +void local_apic::write(uint32_t reg, uint32_t val) +{ + write_once(base_ + (reg >> 2), val); +} + +void local_apic::ack() +{ + write(LAPIC_REG_EOI, 0); +} + +void local_apic::send_ipi(unsigned int dest, unsigned int data) +{ + uint32_t dest_val = (read(IPI_DEST) & 0x00FFFFFF) | (dest << 24); + write(IPI_STATUS, 0); + write(IPI_DEST, dest_val); + + uint32_t icr_val = (read(IPI_ICR) & 0xFFF00000) | data; + write(IPI_ICR, icr_val); + + do { + __asm__ __volatile__("pause" : : : "memory"); + } while (read(IPI_ICR) & (1 << 12)); +} + +local_apic& local_apic::get(void) +{ + return lapic; +} +} diff --git a/arch/x86_64/acpi/rsdp.c b/kexts/drivers/bus/acpi/rsdp.c similarity index 100% rename from arch/x86_64/acpi/rsdp.c rename to kexts/drivers/bus/acpi/rsdp.c diff --git a/arch/x86_64/acpi/smp.cpp b/kexts/drivers/bus/acpi/smp.cpp similarity index 100% rename from arch/x86_64/acpi/smp.cpp rename to kexts/drivers/bus/acpi/smp.cpp