Skip to content

fix(rp2): misc spinlock-related fixes #5041

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
merged 4 commits into from
Sep 19, 2025
Merged

fix(rp2): misc spinlock-related fixes #5041

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0f4cf9e
fix(rp2): disable DBGPAUSE on startup
mikesmitty Sep 16, 2025
fbe051f
fix(rp2): switch spinlock busy loop to wfe
mikesmitty Sep 16, 2025
9db4f8f
fix(rp2): use side-effect-free spinlocks
mikesmitty Sep 16, 2025
fbfdaa5
fix(rp2): reset spinlocks at startup
mikesmitty Sep 17, 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
4 changes: 4 additions & 0 deletions src/machine/machine_rp2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ func machineInit() {

// Peripheral clocks should now all be running
unresetBlockWait(RESETS_RESET_Msk)

// DBGPAUSE pauses the timer when a debugger is connected. This prevents
// sleep functions from ever returning, so disable it.
timer.setDbgPause(false)
}

//go:linkname ticks runtime.machineTicks
Expand Down
12 changes: 12 additions & 0 deletions src/machine/machine_rp2_timer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,3 +101,15 @@ func (tmr *timerType) lightSleep(us uint64) {
// Disable interrupt
intr.Disable()
}

// setDbgPause sets whether this timer is paused when a debugger is connected.
func (tmr *timerType) setDbgPause(enable bool) {
const bitPos = 1
const bitMask = 0b11
val := uint32(0b00)
if enable {
// Disable timer when debugger is connected to either core.
val = 0b11
}
tmr.dbgPause.ReplaceBits(val, bitMask, bitPos)
}