RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-18 21:25:07 +00:00
Code Issues Activity Actions

Kernel: Move DMI decoder initialization method to init_stage2

Browse source 
Also, PCI Initializer dismiss() now deletes the object correctly, and
the PCI initialization process no longer use the DMI decoder to
determine if PCI is supported.
grub configuration files include an entry to boot the OS without
ACPI support.
This commit is contained in:
Liav A 2020-01-13 21:26:46 +02:00 • committed by Andreas Kling
parent 918097ae94
commit c2ef7f740b
5 changed files with 32 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Kernel/init.cpp
View file

@ -79,6 +79,13 @@ VFS* vfs;
root = "/dev/hda";
}
bool dmi_unreliable = KParams::the().has("dmi_unreliable");
if (dmi_unreliable) {
DMIDecoder::initialize_untrusted();
} else {
DMIDecoder::initialize();
}
if (!root.starts_with("/dev/hda")) {
kprintf("init_stage2: root filesystem must be on the first IDE hard drive (/dev/hda)\n");
hang();
@ -258,17 +265,9 @@ extern "C" [[noreturn]] void init(u32 physical_address_for_kernel_page_tables)
bool complete_acpi_disable = KParams::the().has("noacpi");
bool dynamic_acpi_disable = KParams::the().has("noacpi_aml");
bool pci_mmio_disable = KParams::the().has("nopci_mmio");
bool pci_force_probing = KParams::the().has("pci_nodmi");
bool dmi_unreliable = KParams::the().has("dmi_unreliable");
MemoryManager::initialize(physical_address_for_kernel_page_tables);
if (dmi_unreliable) {
DMIDecoder::initialize_untrusted();
} else {
DMIDecoder::initialize();
}
if (complete_acpi_disable) {
ACPIParser::initialize_limited();
} else {
@ -279,12 +278,6 @@ extern "C" [[noreturn]] void init(u32 physical_address_for_kernel_page_tables)
}
}
// Sample test to see if the ACPI parser is working...
kprintf("ACPI: HPET table @ P 0x%x\n", ACPIParser::the().find_table("HPET"));
PCI::Initializer::the().test_and_initialize(pci_mmio_disable, pci_force_probing);
PCI::Initializer::the().dismiss();
vfs = new VFS;
dev_debuglog = new DebugLogDevice;
@ -345,6 +338,12 @@ extern "C" [[noreturn]] void init(u32 physical_address_for_kernel_page_tables)
tty1 = new VirtualConsole(1);
VirtualConsole::switch_to(0);
// Sample test to see if the ACPI parser is working...
kprintf("ACPI: HPET table @ P 0x%x\n", ACPIParser::the().find_table("HPET"));
PCI::Initializer::the().test_and_initialize(pci_mmio_disable);
PCI::Initializer::the().dismiss();
if (APIC::init())
APIC::enable(0);