Skip to content

Backport 27356 ([rescue] Print the rescue protocol type) #29184

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
pamaury merged 1 commit into from
Jan 29, 2026
Merged

Backport 27356 ([rescue] Print the rescue protocol type) #29184

Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions sw/device/silicon_creator/lib/rescue/rescue.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,14 +294,20 @@ hardened_bool_t rescue_detect_entry(const owner_rescue_config_t *config) {
if (rescue_requested == kHardenedBoolTrue) {
return kHardenedBoolTrue;
}
rescue_protocol_t protocol = kRescueProtocolXmodem;
rescue_detect_t detect = kRescueDetectBreak;
uint32_t index = 0;
uint32_t gpio_val = 0;
if ((hardened_bool_t)config != kHardenedBoolFalse) {
protocol = config->protocol;
detect = bitfield_field32_read(config->detect, RESCUE_DETECT);
index = bitfield_field32_read(config->detect, RESCUE_DETECT_INDEX);
gpio_val = bitfield_bit32_read(config->gpio, RESCUE_GPIO_VALUE_BIT);
}
dbg_printf("info: rescue protocol %c\r\n", rescue_type);
if (protocol != rescue_type) {
dbg_printf("warning: rescue configured for protocol %c\r\n", protocol);
}
switch (detect) {
case kRescueDetectNone:
break;
Expand Down
2 changes: 2 additions & 0 deletions sw/device/silicon_creator/lib/rescue/rescue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ typedef struct RescueState {
uint8_t data[2048];
} rescue_state_t;

extern const uint32_t rescue_type;

/**
* Handle rescue modes that involve sending data to the host.
*
Expand Down
2 changes: 2 additions & 0 deletions sw/device/silicon_creator/lib/rescue/rescue_spi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@

#include "hw/top_earlgrey/sw/autogen/top_earlgrey.h"

const uint32_t rescue_type = kRescueProtocolSpiDfu;

enum {
/**
* Base address of the spi_device registers.
Expand Down
2 changes: 2 additions & 0 deletions sw/device/silicon_creator/lib/rescue/rescue_usb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@

#include "hw/top_earlgrey/sw/autogen/top_earlgrey.h"

const uint32_t rescue_type = kRescueProtocolUsbDfu;

static const usb_device_descriptor_t device_desc = {
.length = (uint8_t)sizeof(usb_device_descriptor_t),
.descriptor_type = kUsbDescTypeDevice,
Expand Down
2 changes: 2 additions & 0 deletions sw/device/silicon_creator/lib/rescue/rescue_xmodem.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
#include "sw/device/silicon_creator/lib/rescue/rescue.h"
#include "sw/device/silicon_creator/lib/rescue/xmodem.h"

const uint32_t rescue_type = kRescueProtocolXmodem;

// All of the xmodem functions accept an opaque iohandle pointer.
// The iohandle is used to facilitate unit tests and doesn't have
// any function in real firmware.
Expand Down
Loading