enderice2/Fennix
enderice2/Fennix
1
0
Fork 0
mirror of https://github.com/EnderIce2/Fennix.git synced 2025-05-30 00:07:59 +00:00
Code Issues Actions Releases Wiki Activity

Fixed SMP core detection

Browse Source
This commit is contained in:
Alex 2022-10-15 15:09:26 +03:00
parent 6256ab5a4f
commit 004fa99590
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Architecture/amd64/MultipleAPICDescriptionTable.cpp
View File

@ -3,10 +3,13 @@
#include <memory.hpp> #include <memory.hpp>
#include <debug.h> #include <debug.h>
#include "../../kernel.h"
namespace ACPI namespace ACPI
{ {
MADT::MADT(ACPI::MADTHeader *madt) MADT::MADT(ACPI::MADTHeader *madt)
{ {
CPUCores = 0;
LAPICAddress = (LAPIC *)(uintptr_t)madt->LocalControllerAddress; LAPICAddress = (LAPIC *)(uintptr_t)madt->LocalControllerAddress;
for (uint8_t *ptr = (uint8_t *)(madt->Entries); for (uint8_t *ptr = (uint8_t *)(madt->Entries);
(uintptr_t)(ptr) < (uintptr_t)(madt) + madt->Header.Length; (uintptr_t)(ptr) < (uintptr_t)(madt) + madt->Header.Length;
@ -19,7 +22,7 @@ namespace ACPI
if (ptr[4] & 1) if (ptr[4] & 1)
{ {
lapic.push_back((LocalAPIC *)ptr); lapic.push_back((LocalAPIC *)ptr);
trace("Local APIC %#llx (APIC %#llx) found.", lapic.back()->ACPIProcessorId, lapic.back()->APICId); KPrint("Local APIC %d (APIC %d) found.", lapic.back()->ACPIProcessorId, lapic.back()->APICId);
CPUCores++; CPUCores++;
} }
break; break;
@ -27,35 +30,36 @@ namespace ACPI
case 1: case 1:
{ {
ioapic.push_back((MADTIOApic *)ptr); ioapic.push_back((MADTIOApic *)ptr);
trace("I/O APIC %#llx (Address %#llx) found.", ioapic.back()->APICID, ioapic.back()->Address); KPrint("I/O APIC %d (Address %#lx) found.", ioapic.back()->APICID, ioapic.back()->Address);
Memory::Virtual().Map((void *)(uintptr_t)ioapic.back()->Address, (void *)(uintptr_t)ioapic.back()->Address, Memory::PTFlag::RW | Memory::PTFlag::PCD); // Make sure that the address is mapped. Memory::Virtual().Map((void *)(uintptr_t)ioapic.back()->Address, (void *)(uintptr_t)ioapic.back()->Address, Memory::PTFlag::RW | Memory::PTFlag::PCD); // Make sure that the address is mapped.
break; break;
} }
case 2: case 2:
{ {
iso.push_back((MADTIso *)ptr); iso.push_back((MADTIso *)ptr);
trace("ISO (IRQ:%#llx, BUS:%#llx, GSI:%#llx, %s/%s) found.", KPrint("ISO (IRQ:%#lx, BUS:%#lx, GSI:%#lx, %s/%s) found.",
iso.back()->IRQSource, iso.back()->BuSSource, iso.back()->GSI, iso.back()->IRQSource, iso.back()->BuSSource, iso.back()->GSI,
iso.back()->Flags & 0x00000004 ? "Active High" : "Active Low", iso.back()->Flags & 0x00000004 ? "Active High" : "Active Low",
iso.back()->Flags & 0x00000100 ? "Edge Triggered" : "Level Triggered"); iso.back()->Flags & 0x00000100 ? "Edge Triggered" : "Level Triggered");
break; break;
} }
case 4: case 4:
{ {
nmi.push_back((MADTNmi *)ptr); nmi.push_back((MADTNmi *)ptr);
trace("NMI %#llx (lint:%#llx) found.", nmi.back()->processor, nmi.back()->lint); KPrint("NMI %#lx (lint:%#lx) found.", nmi.back()->processor, nmi.back()->lint);
break; break;
} }
case 5: case 5:
{ {
LAPICAddress = (LAPIC *)ptr; LAPICAddress = (LAPIC *)ptr;
trace("APIC found at %#llx", LAPICAddress); KPrint("APIC found at %#lx", LAPICAddress);
break; break;
} }
} }
Memory::Virtual().Map((void *)LAPICAddress, (void *)LAPICAddress, Memory::PTFlag::RW | Memory::PTFlag::PCD); // I should map more than one page? Memory::Virtual().Map((void *)LAPICAddress, (void *)LAPICAddress, Memory::PTFlag::RW | Memory::PTFlag::PCD); // I should map more than one page?
} }
trace("Total CPU cores: %d", CPUCores); CPUCores--; // We start at 0 (BSP) and end at 11 (APs), so we have 12 cores.
KPrint("Total CPU cores: %d", CPUCores + 1);
} }
MADT::~MADT() MADT::~MADT()

2
Architecture/amd64/acpi.hpp
View File

@ -240,7 +240,7 @@ namespace ACPI
Vector<MADTNmi *> nmi; Vector<MADTNmi *> nmi;
Vector<LocalAPIC *> lapic; Vector<LocalAPIC *> lapic;
struct LAPIC *LAPICAddress; struct LAPIC *LAPICAddress;
uint8_t CPUCores; uint16_t CPUCores;
MADT(ACPI::MADTHeader *madt); MADT(ACPI::MADTHeader *madt);
~MADT(); ~MADT();

4
Architecture/amd64/cpu/SymmetricMultiprocessing.cpp
View File

@ -121,6 +121,7 @@ namespace SMP
return; return;
} }
for (uint8_t i = 0; i < ((ACPI::MADT *)madt)->CPUCores; i++) for (uint8_t i = 0; i < ((ACPI::MADT *)madt)->CPUCores; i++)
{
if ((((APIC::APIC *)Interrupts::apic)->Read(APIC::APIC::APIC_ID) >> 24) != ((ACPI::MADT *)madt)->lapic[i]->ACPIProcessorId) if ((((APIC::APIC *)Interrupts::apic)->Read(APIC::APIC::APIC_ID) >> 24) != ((ACPI::MADT *)madt)->lapic[i]->ACPIProcessorId)
{ {
((APIC::APIC *)Interrupts::apic)->Write(APIC::APIC::APIC_ICRHI, (((ACPI::MADT *)madt)->lapic[i]->APICId << 24)); ((APIC::APIC *)Interrupts::apic)->Write(APIC::APIC::APIC_ICRHI, (((ACPI::MADT *)madt)->lapic[i]->APICId << 24));
@ -151,5 +152,8 @@ namespace SMP
trace("CPU %d loaded.", ((ACPI::MADT *)madt)->lapic[i]->APICId); trace("CPU %d loaded.", ((ACPI::MADT *)madt)->lapic[i]->APICId);
CPUEnabled = false; CPUEnabled = false;
} }
else
KPrint("CPU %d is the BSP", ((ACPI::MADT *)madt)->lapic[i]->APICId);
}
} }
} }