Fennix/Kernel
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Kernel.git synced 2025-05-28 23:44:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing SMP stub for x32 and arm64

Browse Source
This commit is contained in:
Alex 2022-10-12 04:34:56 +03:00
parent a2da69d777
commit aae1f22458
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
3 changed files with 83 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Architecture/aarch64/cpu/SymmetricMultiprocessing.cpp Normal file
View File

@ -0,0 +1,40 @@
#include <smp.hpp>
#include <interrupts.hpp>
#include <memory.hpp>
#include <cpu.hpp>
#include "../../../kernel.h"
volatile bool CPUEnabled = false;
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
static __attribute__((aligned(PAGE_SIZE))) CPUData CPUs[MAX_CPU] = {0};
CPUData *GetCPU(uint64_t id) { return &CPUs[id]; }
CPUData *GetCurrentCPU()
{
uint64_t ret = 0;
if (!CPUs[ret].IsActive)
{
error("CPU %d is not active!", ret);
return &CPUs[0];
}
if (CPUs[ret].Checksum != CPU_DATA_CHECKSUM)
{
error("CPU %d data is corrupted!", ret);
return &CPUs[0];
}
return &CPUs[ret];
}
namespace SMP
{
void Initialize(void *madt)
{
fixme("SMP::Initialize() is not implemented!");
}
}

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

@ -27,6 +27,7 @@ enum SMPTrampolineAddress
volatile bool CPUEnabled = false; volatile bool CPUEnabled = false;
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
static __attribute__((aligned(PAGE_SIZE))) CPUData CPUs[MAX_CPU] = {0}; static __attribute__((aligned(PAGE_SIZE))) CPUData CPUs[MAX_CPU] = {0};
CPUData *GetCPU(uint64_t id) { return &CPUs[id]; } CPUData *GetCPU(uint64_t id) { return &CPUs[id]; }
@ -58,7 +59,7 @@ extern "C" void StartCPU()
{ {
CPU::Interrupts(CPU::Disable); CPU::Interrupts(CPU::Disable);
uint64_t CPU_ID; uint64_t CPU_ID;
#if defined(__amd64__)
// Enable CPU features // Enable CPU features
{ {
CPU::x64::CR0 cr0 = CPU::x64::readcr0(); CPU::x64::CR0 cr0 = CPU::x64::readcr0();
@ -103,9 +104,7 @@ extern "C" void StartCPU()
// Initialize GDT and IDT // Initialize GDT and IDT
Interrupts::Initialize(CPU_ID); Interrupts::Initialize(CPU_ID);
#elif defined(__i386__)
#elif defined(__aarch64__)
#endif
CPU::Interrupts(CPU::Enable); CPU::Interrupts(CPU::Enable);
KPrint("CPU %d is online", CPU_ID); KPrint("CPU %d is online", CPU_ID);
CPUEnabled = true; CPUEnabled = true;
@ -116,7 +115,6 @@ namespace SMP
{ {
void Initialize(void *madt) void Initialize(void *madt)
{ {
#if defined(__amd64__)
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)
{ {
@ -148,8 +146,5 @@ 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;
} }
#elif defined(__i386__)
#elif defined(__aarch64__)
#endif
} }
} }

40
Architecture/i686/cpu/SymmetricMultiprocessing.cpp Normal file
View File

@ -0,0 +1,40 @@
#include <smp.hpp>
#include <interrupts.hpp>
#include <memory.hpp>
#include <cpu.hpp>
#include "../../../kernel.h"
volatile bool CPUEnabled = false;
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
static __attribute__((aligned(PAGE_SIZE))) CPUData CPUs[MAX_CPU] = {0};
CPUData *GetCPU(uint64_t id) { return &CPUs[id]; }
CPUData *GetCurrentCPU()
{
uint64_t ret = 0;
if (!CPUs[ret].IsActive)
{
error("CPU %d is not active!", ret);
return &CPUs[0];
}
if (CPUs[ret].Checksum != CPU_DATA_CHECKSUM)
{
error("CPU %d data is corrupted!", ret);
return &CPUs[0];
}
return &CPUs[ret];
}
namespace SMP
{
void Initialize(void *madt)
{
fixme("SMP::Initialize() is not implemented!");
}
}