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

genesys: scaler: Fix checking for CFI size

Browse Source
This commit is contained in:
Gaël PORTAY 2022-06-03 10:34:53 +02:00 committed by Gaël PORTAY
parent 81f40da143
commit ace3f343fc
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
plugins/genesys/fu-genesys-scaler-device.c
View File

@ -1639,6 +1639,8 @@ static gboolean
fu_genesys_scaler_device_setup(FuDevice *device, GError **error)
{
FuGenesysScalerDevice *self = FU_GENESYS_SCALER_DEVICE(device);
guint64 size_min = fu_device_get_firmware_size_max(device);
guint64 size;
guint32 sector_size;
guint32 page_size;
@ -1653,16 +1655,18 @@ fu_genesys_scaler_device_setup(FuDevice *device, GError **error)
if (page_size != 0)
self->page_size = page_size;
if (fu_device_get_firmware_size_max(device) == 0) {
guint64 size_max = fu_device_get_firmware_size_max(FU_DEVICE(self->cfi_device));
if (fu_device_has_flag(device, FWUPD_DEVICE_FLAG_DUAL_IMAGE))
size_min *= 2;
if (size_max == 0)
size_max = 0x400000;
if (fu_device_has_flag(device, FWUPD_DEVICE_FLAG_DUAL_IMAGE))
size_max /= 2;
fu_device_set_firmware_size_max(FU_DEVICE(self), size_max);
size = fu_device_get_firmware_size_max(FU_DEVICE(self->cfi_device));
if (size != 0 && size < size_min) {
g_set_error(error,
FWUPD_ERROR,
FWUPD_ERROR_INTERNAL,
"CFI device too small, got 0x%x, expected >= 0x%x",
(guint)size,
(guint)size_min);
return FALSE;
}
/* success */
@ -1968,9 +1972,10 @@ fu_genesys_scaler_device_init(FuGenesysScalerDevice *self)
fu_device_register_private_flag(FU_DEVICE(self), FU_SCALER_FLAG_USE_I2C_CH0, "use-i2c-ch0");
fu_device_set_install_duration(FU_DEVICE(self), 730); /* 12 min 10 s */
self->sector_size = 0x1000; /* 4KB */
self->page_size = 0x100; /* 256B */
self->transfer_size = 0x40; /* 64B */
self->sector_size = 0x1000; /* 4KB */
self->page_size = 0x100; /* 256B */
self->transfer_size = 0x40; /* 64B */
fu_device_set_firmware_size(FU_DEVICE(self), GENESYS_SCALER_BANK_SIZE); /* 2MB */
}
static void

2
plugins/genesys/fu-genesys-scaler-firmware.c
View File

@ -10,8 +10,6 @@
#include "fu-genesys-scaler-firmware.h"
#define GENESYS_SCALER_BANK_SIZE 0x200000U
struct _FuGenesysScalerFirmware {
FuFirmwareClass parent_instance;
FuGenesysMtkFooter footer;

2
plugins/genesys/fu-genesys-scaler-firmware.h
View File

@ -17,6 +17,8 @@ G_DECLARE_FINAL_TYPE(FuGenesysScalerFirmware,
GENESYS_SCALER_FIRMWARE,
FuFirmware)
#define GENESYS_SCALER_BANK_SIZE 0x200000U
#define MTK_RSA_HEADER "MTK_RSA_HEADER"
typedef struct __attribute__((packed)) {