proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-07-27 06:10:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

usi-dock: Add initialization retry to ensure flash ready

Browse Source
This commit is contained in:
Victor Cheng 2022-09-22 20:38:34 +08:00 committed by Richard Hughes
parent 2c515f9a7b
commit ae74625721
1 changed files with 41 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
plugins/usi-dock/fu-usi-dock-mcu-device.c
View File

@ -523,6 +523,37 @@ fu_usi_dock_mcu_device_wait_for_spi_ready_cb(FuDevice *device, gpointer user_dat
return TRUE; return TRUE;
} }
static gboolean
fu_usi_dock_mcu_device_wait_for_spi_initial_ready_cb(FuDevice *device,
gpointer user_data,
GError **error)
{
FuUsiDockMcuDevice *self = FU_USI_DOCK_MCU_DEVICE(device);
guint8 buf[] = {USBUID_ISP_DEVICE_CMD_FWBUFER_INITIAL};
guint8 val = 0;
if (!fu_usi_dock_mcu_device_txrx(self,
TAG_TAG2_CMD_SPI,
buf,
sizeof(buf),
&val,
sizeof(val),
error))
return FALSE;
if (val != SPI_STATE_READY) {
g_set_error(error,
G_IO_ERROR,
G_IO_ERROR_BUSY,
"SPI state is %s [0x%02x]",
fu_usi_dock_spi_state_to_string(val),
val);
return FALSE;
}
/* success */
return TRUE;
}
static gboolean static gboolean
fu_usi_dock_mcu_device_wait_for_checksum_cb(FuDevice *device, gpointer user_data, GError **error) fu_usi_dock_mcu_device_wait_for_checksum_cb(FuDevice *device, gpointer user_data, GError **error)
{ {
@ -548,7 +579,6 @@ fu_usi_dock_mcu_device_write_firmware_with_idx(FuUsiDockMcuDevice *self,
GError **error) GError **error)
{ {
guint8 cmd; guint8 cmd;
guint8 val = 0x0;
g_autoptr(GBytes) fw = NULL; g_autoptr(GBytes) fw = NULL;
g_autoptr(GPtrArray) chunks = NULL; g_autoptr(GPtrArray) chunks = NULL;
guint8 checksum = 0xFF; guint8 checksum = 0xFF;
@ -557,27 +587,18 @@ fu_usi_dock_mcu_device_write_firmware_with_idx(FuUsiDockMcuDevice *self,
fu_progress_set_id(progress, G_STRLOC); fu_progress_set_id(progress, G_STRLOC);
fu_progress_add_flag(progress, FU_PROGRESS_FLAG_GUESSED); fu_progress_add_flag(progress, FU_PROGRESS_FLAG_GUESSED);
fu_progress_add_step(progress, FWUPD_STATUS_DEVICE_BUSY, 0, NULL); fu_progress_add_step(progress, FWUPD_STATUS_DEVICE_BUSY, 0, NULL);
fu_progress_add_step(progress, FWUPD_STATUS_DEVICE_ERASE, 6, NULL); fu_progress_add_step(progress, FWUPD_STATUS_DEVICE_ERASE, 5, NULL);
fu_progress_add_step(progress, FWUPD_STATUS_DEVICE_WRITE, 40, "write-external"); fu_progress_add_step(progress, FWUPD_STATUS_DEVICE_WRITE, 69, "write-external");
fu_progress_add_step(progress, FWUPD_STATUS_DEVICE_WRITE, 13, "wait-for-checksum"); fu_progress_add_step(progress, FWUPD_STATUS_DEVICE_WRITE, 25, "wait-for-checksum");
fu_progress_add_step(progress, FWUPD_STATUS_DEVICE_WRITE, 42, "internal-flash"); fu_progress_add_step(progress, FWUPD_STATUS_DEVICE_WRITE, 0, "internal-flash");
/* initial external flash */ /* initial external flash */
cmd = USBUID_ISP_DEVICE_CMD_FWBUFER_INITIAL; if (!fu_device_retry(FU_DEVICE(self),
if (!fu_usi_dock_mcu_device_txrx(self, fu_usi_dock_mcu_device_wait_for_spi_initial_ready_cb,
TAG_TAG2_CMD_SPI, 30,
&cmd, NULL,
sizeof(cmd), error)) {
&val, g_prefix_error(error, "failed to wait for initial: ");
sizeof(val),
error))
return FALSE;
if (val != SPI_STATE_READY) {
g_set_error(error,
G_IO_ERROR,
G_IO_ERROR_INVALID_DATA,
"invalid state for CMD_FWBUFER_INITIAL, got 0x%02x",
val);
return FALSE; return FALSE;
} }
fu_progress_step_done(progress); fu_progress_step_done(progress);