Skip to content

Changed cpu_full_halt to account for unlikely accidental hardware errors with IF desyncing from reflock state #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
0Nera merged 1 commit into from
Jan 15, 2025
Merged

Changed cpu_full_halt to account for unlikely accidental hardware errors with IF desyncing from reflock state #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions kernel/arch/amd64/cpu/control.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@
#include "kreflock.h"
#include "kstdlib.h"

static inline void __cpu_enable_interrupt() {
static inline void __cpu_enable_interrupts() {
asm volatile("sti");
}

static inline void __cpu_disable_interrupt() {
static inline void __cpu_disable_interrupts() {
asm volatile("cli");
}

static reflock_t lock =
NEW_REFLOCK(__cpu_disable_interrupt, __cpu_enable_interrupt, false, true);
NEW_REFLOCK(__cpu_disable_interrupts, __cpu_enable_interrupts, false, true);

bool cpu_interrupt_lock_acquired() {
if (unlikely(!reflock_validate(&lock))) {
Expand Down Expand Up @@ -68,7 +68,10 @@ void cpu_halt() {
}

void cpu_full_halt() {
reflock_acquire(&lock);
if (unlikely(!reflock_is_locked(&lock)))
reflock_acquire(&lock);
else
__cpu_disable_interrupts();
lock.allow_force_unlock = false;
cpu_halt();
}
Loading