proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-09 21:08:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cros-ec: adding stay-in-ro command if EC is in bootloader

Browse Source
This commit is contained in:
Boris Mittelberg 2022-08-09 23:52:51 -07:00 committed by Richard Hughes
parent 7ddbe5e0b3
commit b48cd9fea6
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
plugins/cros-ec/fu-cros-ec-usb-device.c
View File

@ -764,6 +764,29 @@ fu_cros_ec_usb_device_jump_to_rw(FuDevice *device)
return TRUE; return TRUE;
} }
static gboolean
fu_cros_ec_usb_device_stay_in_ro(FuDevice *device, GError **error)
{
gsize response_size = 1;
guint8 response;
guint16 subcommand = UPDATE_EXTRA_CMD_STAY_IN_RO;
guint8 command_body[2]; /* Max command body size. */
gsize command_body_size = 0;
if (!fu_cros_ec_usb_device_send_subcommand(device,
subcommand,
command_body,
command_body_size,
&response,
&response_size,
FALSE,
error)) {
return FALSE;
}
return TRUE;
}
static gboolean static gboolean
fu_cros_ec_usb_device_write_firmware(FuDevice *device, fu_cros_ec_usb_device_write_firmware(FuDevice *device,
FuFirmware *firmware, FuFirmware *firmware,
@ -778,22 +801,10 @@ fu_cros_ec_usb_device_write_firmware(FuDevice *device,
fu_device_remove_private_flag(device, FU_CROS_EC_USB_DEVICE_FLAG_SPECIAL); fu_device_remove_private_flag(device, FU_CROS_EC_USB_DEVICE_FLAG_SPECIAL);
if (fu_device_has_private_flag(device, FU_CROS_EC_USB_DEVICE_FLAG_REBOOTING_TO_RO)) { if (fu_device_has_private_flag(device, FU_CROS_EC_USB_DEVICE_FLAG_REBOOTING_TO_RO)) {
gsize response_size = 1;
guint8 response;
guint16 subcommand = UPDATE_EXTRA_CMD_STAY_IN_RO;
guint8 command_body[2]; /* Max command body size. */
gsize command_body_size = 0;
START_RESP start_resp; START_RESP start_resp;
fu_device_remove_private_flag(device, FU_CROS_EC_USB_DEVICE_FLAG_REBOOTING_TO_RO); fu_device_remove_private_flag(device, FU_CROS_EC_USB_DEVICE_FLAG_REBOOTING_TO_RO);
if (!fu_cros_ec_usb_device_send_subcommand(device, if (!fu_cros_ec_usb_device_stay_in_ro(device, error)) {
subcommand,
command_body,
command_body_size,
&response,
&response_size,
FALSE,
error)) {
g_prefix_error(error, "failed to send stay-in-ro subcommand: "); g_prefix_error(error, "failed to send stay-in-ro subcommand: ");
return FALSE; return FALSE;
} }
@ -960,6 +971,8 @@ fu_cros_ec_usb_device_detach(FuDevice *device, FuProgress *progress, GError **er
return TRUE; return TRUE;
if (self->in_bootloader) { if (self->in_bootloader) {
/* If EC just rebooted - prevent jumping to RW during the update */
fu_device_add_private_flag(device, FU_CROS_EC_USB_DEVICE_FLAG_REBOOTING_TO_RO);
g_debug("skipping immediate reboot in case of already in bootloader"); g_debug("skipping immediate reboot in case of already in bootloader");
/* in RO so skip reboot */ /* in RO so skip reboot */
return TRUE; return TRUE;