From 236963e7563be3e3f8220dac7bb4af446928e194 Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Mon, 24 Jun 2024 22:55:29 -0400 Subject: Clean out for expt Signed-off-by: Ian Moffett --- sys/firmware/acpi/acpi_init.c | 111 ------------------------------- sys/firmware/acpi/acpi_madt.c | 150 ------------------------------------------ sys/firmware/acpi/acpi_subr.c | 81 ----------------------- 3 files changed, 342 deletions(-) delete mode 100644 sys/firmware/acpi/acpi_init.c delete mode 100644 sys/firmware/acpi/acpi_madt.c delete mode 100644 sys/firmware/acpi/acpi_subr.c (limited to 'sys/firmware/acpi') diff --git a/sys/firmware/acpi/acpi_init.c b/sys/firmware/acpi/acpi_init.c deleted file mode 100644 index a98e429..0000000 --- a/sys/firmware/acpi/acpi_init.c +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Copyright (c) 2023-2024 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. - */ - -#include -#include -#include -#include -#include -#include -#include - -__MODULE_NAME("acpi"); -__KERNEL_META("$Hyra$: acpi_init.c, Ian Marco Moffett, " - "ACPI init logic"); - -#define pr_trace(fmt, ...) kprintf("acpi: " fmt, ##__VA_ARGS__) - -static volatile struct limine_rsdp_request rsdp_req = { - .id = LIMINE_RSDP_REQUEST, - .revision = 0 -}; - -static size_t root_sdt_entries = 0; -static bool using_xsdt = false; -static struct acpi_root_sdt *root_sdt = NULL; - -/* - * Writes out OEMID of ACPI header. - * - * @type: Type of structure (e.g RSDP) - * @hdr: Header of structure. - */ -static void -acpi_print_oemid(const char *type, char oemid[OEMID_SIZE]) -{ - if (type != NULL) { - pr_trace("%s OEMID: ", type); - } - - for (size_t i = 0; i < OEMID_SIZE; ++i) { - kprintf(OMIT_TIMESTAMP "%c", oemid[i]); - } - kprintf(OMIT_TIMESTAMP "\n"); -} - -struct acpi_root_sdt * -acpi_get_root_sdt(void) -{ - return root_sdt; -} - -size_t -acpi_get_root_sdt_len(void) -{ - return root_sdt_entries; -} - -void -acpi_init(void) -{ - struct acpi_rsdp *rsdp; - - /* Can't do anything if we have no response! */ - if (rsdp_req.response == NULL) { - panic("RSDP request has no response affiliated...\n"); - } - - /* Fetch the RSDP */ - rsdp = rsdp_req.response->address; - acpi_print_oemid("RSDP", rsdp->oemid); - - /* Fetch the RSDT/XSDT */ - if (rsdp->revision >= 2) { - using_xsdt = true; - root_sdt = PHYS_TO_VIRT(rsdp->xsdt_addr); - pr_trace("Using XSDT as root SDT\n"); - } else { - root_sdt = PHYS_TO_VIRT(rsdp->rsdt_addr); - pr_trace("Using RSDT as root SDT\n"); - } - if (!acpi_is_checksum_valid(&root_sdt->hdr)) { - panic("Root SDT has an invalid checksum!\n"); - } - root_sdt_entries = (root_sdt->hdr.length - sizeof(root_sdt->hdr)) / 4; -} diff --git a/sys/firmware/acpi/acpi_madt.c b/sys/firmware/acpi/acpi_madt.c deleted file mode 100644 index 0e2b338..0000000 --- a/sys/firmware/acpi/acpi_madt.c +++ /dev/null @@ -1,150 +0,0 @@ -/* - * Copyright (c) 2023-2024 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. - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#define APIC_TYPE_LOCAL_APIC 0 -#define APIC_TYPE_IO_APIC 1 -#define APIC_TYPE_INTERRUPT_OVERRIDE 2 - -#define pr_trace(fmt, ...) kprintf("acpi: " fmt, ##__VA_ARGS__) - -__MODULE_NAME("acpi"); -__KERNEL_META("$Hyra$: acpi_madt.c, Ian Marco Moffett, " - "ACPI MADT parsing"); - - -static struct acpi_madt *madt = NULL; - -void * -acpi_get_lapic_base(void) -{ - if (madt == NULL) - return NULL; - return (void *)(uint64_t)madt->lapic_addr; -} - -static void -do_parse(struct cpu_info *ci) -{ - uint8_t *cur = NULL; - uint8_t *end = NULL; - - void *ioapic_mmio_base = NULL; - - struct apic_header *hdr = NULL; - struct ioapic *ioapic = NULL; - - cur = (uint8_t *)(madt + 1); - end = (uint8_t *)madt + madt->hdr.length; - - /* Parse the rest of the MADT */ - while (cur < end) { - hdr = (void *)cur; - - switch (hdr->type) { - case APIC_TYPE_IO_APIC: - /* - * TODO: Figure out how to use multiple - * I/O APICs. - */ - if (ioapic != NULL) { - break; - } - - ioapic = (struct ioapic *)cur; - - pr_trace("Detected I/O APIC (id=%d, gsi_base=%d)\n", - ioapic->ioapic_id, ioapic->gsi_base); - - ioapic_mmio_base = (void *)(uintptr_t)ioapic->ioapic_addr; - ioapic_set_base(ioapic_mmio_base); - break; - } - - cur += hdr->length; - } -} - -/* - * Converts IRQ numbers to its corresponding - * Global System Interrupt (GSI) number. - * - * @irq: IRQ number. - */ -uint32_t -irq_to_gsi(uint8_t irq) -{ - struct apic_header *hdr = NULL; - struct interrupt_override *override = NULL; - uint8_t *cur = NULL; - uint8_t *end = NULL; - - cur = (uint8_t *)(madt + 1); - end = (uint8_t *)madt + madt->hdr.length; - - while (cur < end) { - hdr = (void *)cur; - - switch (hdr->type) { - case APIC_TYPE_INTERRUPT_OVERRIDE: - override = (struct interrupt_override *)cur; - if (override->source == irq) { - return override->interrupt; - } - } - - cur += hdr->length; - } - - return irq; -} - -void -acpi_parse_madt(struct cpu_info *ci) -{ - /* Prevent this function from running twice */ - if (madt != NULL) { - return; - } - - madt = acpi_query("APIC"); - if (madt == NULL) { - panic("Failed to query for ACPI MADT\n"); - } - - do_parse(ci); -} diff --git a/sys/firmware/acpi/acpi_subr.c b/sys/firmware/acpi/acpi_subr.c deleted file mode 100644 index 4ca7555..0000000 --- a/sys/firmware/acpi/acpi_subr.c +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (c) 2023-2024 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. - */ - -#include -#include -#include -#include - -bool -acpi_is_checksum_valid(struct acpi_header *hdr) -{ - uint8_t sum; - - sum = 0; - for (int i = 0; i < hdr->length; ++i) { - sum += ((char *)hdr)[i]; - } - - /* Sum of table (from header to end) must be zero!! */ - return sum == 0; -} - -/* - * Looks up an ACPI table with a specific - * signature e.g "APIC" for MADT (if present). - * - * @query: The specific query to make e.g "APIC" - */ -void * -acpi_query(const char *query) -{ - struct acpi_header *hdr; - struct acpi_root_sdt *root_sdt; - size_t root_sdt_len, signature_len; - - root_sdt = acpi_get_root_sdt(); - root_sdt_len = acpi_get_root_sdt_len(); - - /* - * XXX: Just a reminder, sizeof() is compile time. - * There will be no actual reading, - * so this is safe. - */ - signature_len = sizeof(hdr->signature); - - for (size_t i = 0; i < root_sdt_len; ++i) { - hdr = (struct acpi_header *)PHYS_TO_VIRT(root_sdt->tables[i]); - - if (memcmp(hdr->signature, query, signature_len) == 0) { - return (void *)hdr; - } - } - - return NULL; -} -- cgit v1.2.3