From e642f3900f33cb0b96486a83e656f1876f770ef6 Mon Sep 17 00:00:00 2001 From: Drew Galbraith Date: Wed, 15 Nov 2023 16:09:36 -0800 Subject: [PATCH] [Zion] Print less about acpi on boot. --- zion/boot/acpi.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/zion/boot/acpi.cpp b/zion/boot/acpi.cpp index 16c6e91..1639676 100644 --- a/zion/boot/acpi.cpp +++ b/zion/boot/acpi.cpp @@ -139,13 +139,18 @@ void ParseMcfg(SdtHeader* rsdt) { } void ParseMadt(SdtHeader* rsdt) { +#if K_ACPI_DEBUG dbgsz(rsdt->signature, 4); +#endif uint64_t max_addr = reinterpret_cast(rsdt) + rsdt->length; MadtHeader* header = reinterpret_cast(rsdt); +#if K_ACPI_DEBUG dbgln("Local APIC {x}", header->local_apic_address); - gLApicBase = header->local_apic_address; dbgln("Flags: {x}", header->flags); +#endif + + gLApicBase = header->local_apic_address; MadtEntry* entry = &header->first_entry; @@ -153,14 +158,18 @@ void ParseMadt(SdtHeader* rsdt) { switch (entry->type) { case 0: { MadtLocalApic* local = reinterpret_cast(entry); +#if K_ACPI_DEBUG dbgln("Local APIC (Proc id, id, flags): {x}, {x}, {x}", local->processor_id, local->apic_id, local->flags); +#endif break; } case 1: { MadtIoApic* io = reinterpret_cast(entry); +#if K_ACPI_DEBUG dbgln("IO Apic (id, addr, gsi base): {x}, {x}, {x}", io->io_apic_id, io->io_apic_address, io->global_system_interrupt_base); +#endif if (gIOApicBase != 0) { dbgln("More than one IOApic, unhandled"); } @@ -170,16 +179,20 @@ void ParseMadt(SdtHeader* rsdt) { case 2: { MadtIoApicInterruptSource* src = reinterpret_cast(entry); +#if K_ACPI_DEBUG dbgln("IO Source (Bus, IRQ, GSI, flags): {x}, {x}, {x}, {x}", src->bus_source, src->irq_source, src->global_system_interrupt, src->flags); +#endif break; } case 4: { MadtLocalApicNonMaskable* lnmi = reinterpret_cast(entry); +#if K_ACPI_DEBUG dbgln("Local NMI (proc id, flags, lint#): {x}, {x}, {x}", lnmi->apic_processor_id, lnmi->flags, lnmi->lint_num); +#endif break; } default: