From 9a6eae69ba4532d6b1ef84e28098a0aa52f7967a Mon Sep 17 00:00:00 2001 From: Bananymous Date: Mon, 25 Aug 2025 17:11:32 +0300 Subject: [PATCH] Kernel: Replace all occurances of BSB with BSP --- kernel/include/kernel/Processor.h | 6 +++--- kernel/kernel/APIC.cpp | 2 +- kernel/kernel/IDT.cpp | 2 +- kernel/kernel/Process.cpp | 2 +- kernel/kernel/Processor.cpp | 20 ++++++++++---------- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/kernel/include/kernel/Processor.h b/kernel/include/kernel/Processor.h index 2939fa26..bda1fc1d 100644 --- a/kernel/include/kernel/Processor.h +++ b/kernel/include/kernel/Processor.h @@ -64,8 +64,8 @@ namespace Kernel static void toggle_should_print_cpu_load() { s_should_print_cpu_load = !s_should_print_cpu_load; } static bool get_should_print_cpu_load() { return s_should_print_cpu_load; } - static ProcessorID bsb_id() { return s_bsb_id; } - static bool current_is_bsb() { return current_id() == bsb_id(); } + static ProcessorID bsp_id() { return s_bsp_id; } + static bool current_is_bsp() { return current_id() == bsp_id(); } static void set_interrupt_state(InterruptState state) { @@ -153,7 +153,7 @@ namespace Kernel } private: - static ProcessorID s_bsb_id; + static ProcessorID s_bsp_id; static BAN::Atomic s_processor_count; static BAN::Atomic s_is_smp_enabled; static BAN::Atomic s_should_print_cpu_load; diff --git a/kernel/kernel/APIC.cpp b/kernel/kernel/APIC.cpp index f13f59f7..db438659 100644 --- a/kernel/kernel/APIC.cpp +++ b/kernel/kernel/APIC.cpp @@ -488,7 +488,7 @@ namespace Kernel redir.vector = IRQ_VECTOR_BASE + irq; redir.mask = 0; // FIXME: distribute IRQs more evenly? - redir.destination = Kernel::Processor::bsb_id().as_u32(); + redir.destination = Kernel::Processor::bsp_id().as_u32(); ioapic->write(IOAPIC_REDIRS + pin * 2, redir.lo_dword); ioapic->write(IOAPIC_REDIRS + pin * 2 + 1, redir.hi_dword); diff --git a/kernel/kernel/IDT.cpp b/kernel/kernel/IDT.cpp index 516546cf..e9a7a043 100644 --- a/kernel/kernel/IDT.cpp +++ b/kernel/kernel/IDT.cpp @@ -336,7 +336,7 @@ namespace Kernel ASSERT(InterruptController::get().is_in_service(IRQ_TIMER - IRQ_VECTOR_BASE)); InterruptController::get().eoi(IRQ_TIMER - IRQ_VECTOR_BASE); - if (Processor::current_is_bsb()) + if (Processor::current_is_bsp()) Process::update_alarm_queue(); Processor::scheduler().timer_interrupt(); diff --git a/kernel/kernel/Process.cpp b/kernel/kernel/Process.cpp index 88b1b2b4..1b94d00d 100644 --- a/kernel/kernel/Process.cpp +++ b/kernel/kernel/Process.cpp @@ -954,7 +954,7 @@ namespace Kernel void Process::update_alarm_queue() { - ASSERT(Processor::current_is_bsb()); + ASSERT(Processor::current_is_bsp()); SpinLockGuard _(s_process_lock); diff --git a/kernel/kernel/Processor.cpp b/kernel/kernel/Processor.cpp index 5ed0171a..5f181de3 100644 --- a/kernel/kernel/Processor.cpp +++ b/kernel/kernel/Processor.cpp @@ -13,7 +13,7 @@ namespace Kernel static constexpr uint32_t MSR_IA32_GS_BASE = 0xC0000101; #endif - ProcessorID Processor::s_bsb_id { PROCESSOR_NONE }; + ProcessorID Processor::s_bsp_id { PROCESSOR_NONE }; BAN::Atomic Processor::s_processor_count { 0 }; BAN::Atomic Processor::s_is_smp_enabled { false }; BAN::Atomic Processor::s_should_print_cpu_load { false }; @@ -41,10 +41,10 @@ namespace Kernel Processor& Processor::create(ProcessorID id) { - // bsb is the first processor - if (s_bsb_id == PROCESSOR_NONE && id == PROCESSOR_NONE) - s_bsb_id = id = read_processor_id(); - if (s_bsb_id == PROCESSOR_NONE || id == PROCESSOR_NONE || id.m_id >= s_processors.size()) + // bsp is the first processor + if (s_bsp_id == PROCESSOR_NONE && id == PROCESSOR_NONE) + s_bsp_id = id = read_processor_id(); + if (s_bsp_id == PROCESSOR_NONE || id == PROCESSOR_NONE || id.m_id >= s_processors.size()) Kernel::panic("Trying to initialize invalid processor {}", id.m_id); auto& processor = s_processors[id.m_id]; @@ -114,13 +114,13 @@ namespace Kernel { if (s_processors_created == 1) { - ASSERT(current_is_bsb()); + ASSERT(current_is_bsp()); s_processor_count++; s_processor_ids[0] = current_id(); } - // wait until bsb is ready - if (current_is_bsb()) + // wait until bsp is ready + if (current_is_bsp()) { s_processor_count = 1; s_processor_ids[0] = current_id(); @@ -143,7 +143,7 @@ namespace Kernel } else { - // wait until bsb is ready, it shall get index 0 + // wait until bsp is ready, it shall get index 0 while (s_processor_count == 0) __builtin_ia32_pause(); @@ -162,7 +162,7 @@ namespace Kernel { if (SystemTimer::get().ms_since_boot() >= timeout_ms) { - if (current_is_bsb()) + if (current_is_bsp()) dprintln("Could not initialize {} processors :(", s_processors_created - s_processor_count); break; }