Skip to content
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

Fix watchdog timeout #371

Merged
merged 2 commits into from
Jan 24, 2024
Merged

Fix watchdog timeout #371

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24a05c1
Fix watch dog timeout
morio Dec 22, 2023
47032af
Use the proper SP with watchdog timeouts
morio Dec 27, 2023
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
19 changes: 13 additions & 6 deletions lib/ZuluSCSI_platform_RP2040/ZuluSCSI_platform.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,10 +638,14 @@ static void watchdog_callback(unsigned alarm_num)
logmsg("scsiDev.phase: ", (int)scsiDev.phase);
scsi_accel_log_state();

uint32_t *p = (uint32_t*)__get_PSP();
#ifdef __MBED__
uint32_t *p = (uint32_t*)__get_PSP();
#else
uint32_t *p = (uint32_t*)__get_MSP();
#endif
for (int i = 0; i < 8; i++)
{
if (p == &__StackTop) break; // End of stack
if (p == &__StackTop) break; // End of stack

logmsg("STACK ", (uint32_t)p, ": ", p[0], " ", p[1], " ", p[2], " ", p[3]);
p += 4;
Expand All @@ -654,14 +658,18 @@ static void watchdog_callback(unsigned alarm_num)
if (g_watchdog_timeout <= 0)
{
logmsg("--------------");
logmsg("WATCHDOG TIMEOUT!");
logmsg("WATCHDOG TIMEOUT, already attempted bus reset, rebooting");
logmsg("Platform: ", g_platform_name);
logmsg("FW Version: ", g_log_firmwareversion);
logmsg("GPIO states: out ", sio_hw->gpio_out, " oe ", sio_hw->gpio_oe, " in ", sio_hw->gpio_in);
logmsg("scsiDev.cdb: ", bytearray(scsiDev.cdb, 12));
logmsg("scsiDev.phase: ", (int)scsiDev.phase);

uint32_t *p = (uint32_t*)__get_PSP();
#ifdef __MBED__
uint32_t *p = (uint32_t*)__get_PSP();
#else
uint32_t *p = (uint32_t*)__get_MSP();
#endif
for (int i = 0; i < 8; i++)
{
if (p == &__StackTop) break; // End of stack
Expand All @@ -678,7 +686,7 @@ static void watchdog_callback(unsigned alarm_num)
}
}

hardware_alarm_set_target(3, delayed_by_ms(get_absolute_time(), 1000));
hardware_alarm_set_target(alarm_num, delayed_by_ms(get_absolute_time(), 1000));
}

// This function can be used to periodically reset watchdog timer for crash handling.
Expand All @@ -687,7 +695,6 @@ void platform_reset_watchdog()
{
g_watchdog_timeout = WATCHDOG_CRASH_TIMEOUT;


if (!g_watchdog_initialized)
{
int alarm_num = -1;
Expand Down
Loading