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

synaptics-rmi: Read the config partition the same as rmi4utils

Browse Source
This commit is contained in:
Richard Hughes 2019-10-04 15:47:16 +01:00
parent 4b30380e78
commit 007140bd78
1 changed files with 38 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
plugins/synaptics-rmi/fu-synaptics-rmi-v7-device.c
View File

@ -380,39 +380,6 @@ fu_synaptics_rmi_v7_device_write_firmware (FuDevice *device,
return TRUE; return TRUE;
} }
static gboolean
fu_synaptics_rmi_v7_device_read_blocks (FuSynapticsRmiDevice *self,
guint32 address,
const guint8 *data,
guint32 datasz,
GError **error)
{
FuSynapticsRmiFlash *flash = fu_synaptics_rmi_device_get_flash (self);
g_autoptr(GPtrArray) chunks = NULL;
/* read blocks */
chunks = fu_chunk_array_new (data, datasz,
0x00, /* start addr */
0x00, /* page_sz */
flash->block_size);
for (guint i = 0; i < chunks->len; i++) {
FuChunk *chk = g_ptr_array_index (chunks, i);
g_autoptr(GByteArray) req_tmp = NULL;
req_tmp = fu_synaptics_rmi_device_read (self, address, chk->data_sz, error);
if (req_tmp == NULL) {
g_prefix_error (error, "failed to read block @0x%x: ", chk->address);
return FALSE;
}
if (!fu_memcpy_safe ((guint8 *) chk->data, chk->data_sz, 0x0, /* dst */
req_tmp->data, req_tmp->len, 0x0, /* src */
req_tmp->len, error))
return FALSE;
}
/* success */
return TRUE;
}
typedef struct __attribute__((packed)) { typedef struct __attribute__((packed)) {
guint16 partition_id; guint16 partition_id;
guint16 partition_len; guint16 partition_len;
@ -427,11 +394,11 @@ fu_synaptics_rmi_device_read_flash_config_v7 (FuSynapticsRmiDevice *self, GError
{ {
FuSynapticsRmiFlash *flash = fu_synaptics_rmi_device_get_flash (self); FuSynapticsRmiFlash *flash = fu_synaptics_rmi_device_get_flash (self);
FuSynapticsRmiFunction *f34; FuSynapticsRmiFunction *f34;
gsize buf_sz = (gsize) flash->block_size * (gsize) flash->config_length;
g_autofree guint8 *buf = g_malloc0 (buf_sz);
g_autoptr(GByteArray) req_addr_zero = g_byte_array_new (); g_autoptr(GByteArray) req_addr_zero = g_byte_array_new ();
g_autoptr(GByteArray) req_cmd = g_byte_array_new ();
g_autoptr(GByteArray) req_partition_id = g_byte_array_new (); g_autoptr(GByteArray) req_partition_id = g_byte_array_new ();
g_autoptr(GPtrArray) chunks = NULL; g_autoptr(GByteArray) req_transfer_length = g_byte_array_new ();
g_autoptr(GByteArray) res = NULL;
/* f34 */ /* f34 */
f34 = fu_synaptics_rmi_device_get_function (self, 0x34, error); f34 = fu_synaptics_rmi_device_get_function (self, 0x34, error);
@ -456,18 +423,13 @@ fu_synaptics_rmi_device_read_flash_config_v7 (FuSynapticsRmiDevice *self, GError
return FALSE; return FALSE;
} }
/* read back entire buffer in payload length chunks */
chunks = fu_chunk_array_new (buf, buf_sz, 0x0, 0x0, flash->payload_length);
for (guint i = 0; i < chunks->len; i++) {
FuChunk *chunk = g_ptr_array_index (chunks, i);
g_autoptr(GByteArray) req_cmd = g_byte_array_new ();
g_autoptr(GByteArray) req_read = g_byte_array_new ();
/* set transfer length */ /* set transfer length */
fu_byte_array_append_uint16 (req_read, chunk->data_sz, G_LITTLE_ENDIAN); fu_byte_array_append_uint16 (req_transfer_length,
flash->config_length,
G_LITTLE_ENDIAN);
if (!fu_synaptics_rmi_device_write (self, if (!fu_synaptics_rmi_device_write (self,
f34->data_base + 0x3, f34->data_base + 0x3,
req_read, req_transfer_length,
error)) { error)) {
g_prefix_error (error, "failed to set transfer length: "); g_prefix_error (error, "failed to set transfer length: ");
return FALSE; return FALSE;
@ -483,30 +445,31 @@ fu_synaptics_rmi_device_read_flash_config_v7 (FuSynapticsRmiDevice *self, GError
return FALSE; return FALSE;
} }
if (!fu_synaptics_rmi_device_poll_wait (self, error)) { if (!fu_synaptics_rmi_device_poll_wait (self, error)) {
g_prefix_error (error, "failed to get flash success: "); g_prefix_error (error, "failed to wait: ");
return FALSE; return FALSE;
} }
if (!fu_synaptics_rmi_v7_device_read_blocks (self,
/* read back entire buffer in blocks */
res = fu_synaptics_rmi_device_read (self,
f34->data_base + 0x5, f34->data_base + 0x5,
chunk->data, flash->block_size * flash->config_length,
chunk->data_sz, error);
error)) { if (res == NULL) {
g_prefix_error (error, "failed to read @0x%x: ", chunk->address); g_prefix_error (error, "failed to read: ");
return FALSE; return FALSE;
} }
}
/* debugging */ /* debugging */
if (g_getenv ("FWUPD_SYNAPTICS_RMI_VERBOSE") != NULL) { if (g_getenv ("FWUPD_SYNAPTICS_RMI_VERBOSE") != NULL) {
fu_common_dump_full (G_LOG_DOMAIN, "FlashConfig", buf, buf_sz, fu_common_dump_full (G_LOG_DOMAIN, "FlashConfig", res->data, res->len,
80, FU_DUMP_FLAGS_NONE); 80, FU_DUMP_FLAGS_NONE);
} }
/* parse the config length */ /* parse the config length */
for (guint i = 0x2; i < buf_sz; i += sizeof(RmiPartitionTbl)) { for (guint i = 0x2; i < res->len; i += sizeof(RmiPartitionTbl)) {
RmiPartitionTbl tbl; RmiPartitionTbl tbl;
if (!fu_memcpy_safe ((guint8 *) &tbl, sizeof(tbl), 0x0, /* dst */ if (!fu_memcpy_safe ((guint8 *) &tbl, sizeof(tbl), 0x0, /* dst */
buf, buf_sz, i, /* src */ res->data, res->len, i, /* src */
sizeof(tbl), error)) sizeof(tbl), error))
return FALSE; return FALSE;
g_debug ("found partition %s (0x%02x)", g_debug ("found partition %s (0x%02x)",