RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 17:52:45 +00:00
Code Issues Activity Actions

Kernel: Use the CPU# as logical apic id

Browse source
This commit is contained in:
Tom 2020-10-28 16:02:26 -06:00 • committed by Andreas Kling
parent 95bfc12ff4
commit 39f408daa0
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Kernel/Interrupts/APIC.cpp
View file

@ -428,16 +428,16 @@ void APIC::enable(u32 cpu)
Processor::halt(); Processor::halt();
} }
u32 apic_id = (1u << cpu); // Use the CPU# as logical apic id
ASSERT(cpu <= 0xff);
write_register(APIC_REG_LD, (read_register(APIC_REG_LD) & 0x00ffffff) | (apic_id << 24)); // TODO: only if not in x2apic mode write_register(APIC_REG_LD, (read_register(APIC_REG_LD) & 0x00ffffff) | (cpu << 24)); // TODO: only if not in x2apic mode
// read it back to make sure it's actually set // read it back to make sure it's actually set
apic_id = read_register(APIC_REG_LD) >> 24; auto apic_id = read_register(APIC_REG_LD) >> 24;
Processor::current().info().set_apic_id(apic_id); Processor::current().info().set_apic_id(apic_id);
#if APIC_DEBUG #if APIC_DEBUG
klog() << "Enabling local APIC for cpu #" << cpu << " apic id: " << apic_id; klog() << "Enabling local APIC for cpu #" << cpu << " logical apic id: " << apic_id;
#endif #endif
if (cpu == 0) { if (cpu == 0) {
@ -522,7 +522,7 @@ void APIC::send_ipi(u32 cpu)
ASSERT(cpu != Processor::id()); ASSERT(cpu != Processor::id());
ASSERT(cpu < 8); ASSERT(cpu < 8);
wait_for_pending_icr(); wait_for_pending_icr();
write_icr(ICRReg(IRQ_APIC_IPI + IRQ_VECTOR_BASE, ICRReg::Fixed, ICRReg::Logical, ICRReg::Assert, ICRReg::TriggerMode::Edge, ICRReg::NoShorthand, 1u << cpu)); write_icr(ICRReg(IRQ_APIC_IPI + IRQ_VECTOR_BASE, ICRReg::Fixed, ICRReg::Logical, ICRReg::Assert, ICRReg::TriggerMode::Edge, ICRReg::NoShorthand, cpu));
} }
APICTimer* APIC::initialize_timers(HardwareTimerBase& calibration_timer) APICTimer* APIC::initialize_timers(HardwareTimerBase& calibration_timer)