Skip to content

Fixes to interrupt handling #562

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fixes to interrupt handling #562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9af506
Fixes to interrupt handling
Uthedris May 24, 2025
ce9efe6
Updated interrupt example
Uthedris May 24, 2025
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
5 changes: 5 additions & 0 deletions examples/raspberrypi/rp2xxx/src/interrupts.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@ pub fn main() !void {

interrupt.enable(timer_irq);

// Enable machine external interrupts on RISC-V
if (rp2xxx.compatibility.arch == .riscv) {
microzig.cpu.interrupt.core.enable(.MachineExternal);
}

microzig.cpu.interrupt.enable_interrupts();

while (true) {
Expand Down
2 changes: 1 addition & 1 deletion modules/riscv32-common/src/riscv32_common.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ pub const utilities = struct {
}

pub fn is_pending(int: CoreInterruptEnum) bool {
return csr.mip.read() & (@as(u32, 1) << @intFromEnum(int));
return csr.mip.read() & (@as(u32, 1) << @intFromEnum(int)) != 0;
}

pub fn set_pending(int: CoreInterruptEnum) void {
Expand Down
9 changes: 3 additions & 6 deletions port/raspberrypi/rp2xxx/src/cpus/hazard3.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,16 +116,16 @@ pub const interrupt = struct {
const shift: u4 = @intCast(4 * (num & 0x4));
const set_mask: u16 = @as(u16, @intFromEnum(priority)) << shift;
const clear_mask: u16 = @as(u16, 0xf) << shift;
csr.meifa.clear(.{ .index = index, .window = clear_mask });
csr.meifa.set(.{ .index = index, .window = set_mask });
csr.meipra.clear(.{ .index = index, .window = clear_mask });
csr.meipra.set(.{ .index = index, .window = set_mask });
}

pub fn get_priority(int: ExternalInterrupt) Priority {
const num: u7 = @intFromEnum(int);
const index: u5 = @intCast(num >> 2);
const shift: u4 = @intCast(4 * (num & 0x4));
const mask: u16 = @as(u16, 0xf) << shift;
return @enumFromInt((csr.meifa.read_set(.{ .index = index }).window & mask) >> shift);
return @enumFromInt((csr.meipra.read_set(.{ .index = index }).window & mask) >> shift);
}

pub inline fn has_ram_vectors() bool {
Expand Down Expand Up @@ -219,9 +219,6 @@ pub const startup_logic = struct {
@memcpy(&ram_vectors, &startup_logic.external_interrupt_table);
}

// NOTE: tact1m4n3: I don't think it's fine to enable this behind the user's back.
interrupt.core.enable(.MachineExternal);

microzig_main();
}

Expand Down
Loading