From 0a411b603186122c5a80c79be4b95937255c3622 Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Mon, 17 Nov 2025 00:48:56 -0500 Subject: kern/amd64: cpu: Add initial Local APIC driver Signed-off-by: Ian Moffett --- sys/inc/arch/amd64/lapic.h | 39 +++++++++++++++++++++++++++++++++++++++ sys/inc/arch/amd64/mcb.h | 2 ++ sys/inc/arch/amd64/msr.h | 1 + sys/inc/mu/cpu.h | 2 +- 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 sys/inc/arch/amd64/lapic.h (limited to 'sys/inc') diff --git a/sys/inc/arch/amd64/lapic.h b/sys/inc/arch/amd64/lapic.h new file mode 100644 index 0000000..b65f14b --- /dev/null +++ b/sys/inc/arch/amd64/lapic.h @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2023-2025 Ian Marco Moffett and the Osmora Team. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Hyra nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _MACHINE_LAPIC_H_ +#define _MACHINE_LAPIC_H_ 1 + +/* + * Initialize the Local APIC on-board the + * processor for the current core + */ +void lapic_init(void); + +#endif /* !_MACHINE_LAPIC_H_ */ diff --git a/sys/inc/arch/amd64/mcb.h b/sys/inc/arch/amd64/mcb.h index 8d0777a..eb63365 100644 --- a/sys/inc/arch/amd64/mcb.h +++ b/sys/inc/arch/amd64/mcb.h @@ -39,10 +39,12 @@ * * @hwid: Hardware APIC ID * @xapic_io: MMIO base for the legacy xAPIC + * @has_x2apic: Set if x2APIC mode is supported */ struct mcb { uint32_t hwid; void *xapic_io; + uint8_t has_x2apic : 1; }; #endif /* !_MACHINE_MCB_H_ */ diff --git a/sys/inc/arch/amd64/msr.h b/sys/inc/arch/amd64/msr.h index ab0deb9..e3f8887 100644 --- a/sys/inc/arch/amd64/msr.h +++ b/sys/inc/arch/amd64/msr.h @@ -33,6 +33,7 @@ #include #include +#define IA32_APIC_BASE 0x0000001B #define IA32_GS_BASE 0xC0000101 #define IA32_KERNEL_GS_BASE 0xC0000102 diff --git a/sys/inc/mu/cpu.h b/sys/inc/mu/cpu.h index d49c22e..8965ec3 100644 --- a/sys/inc/mu/cpu.h +++ b/sys/inc/mu/cpu.h @@ -41,7 +41,7 @@ */ struct cpu_info { uint8_t id; - struct mcb *mcb; + struct mcb mcb; }; /* -- cgit v1.2.3