1
0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 15:12:36 +02:00

it87spi.c: Fix layering violation of default_spi_read

default_spi_read() calls spi_read_chunked() with the correct
max_read value of 3 set in the spi master struct.

Change-Id: I199c81e1ba501e86dbfb7cf18e2d1556e30db62e
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/46233
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Sam McNally <sammc@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Edward O'Callaghan 2020-10-09 13:00:17 +11:00 committed by Edward O'Callaghan
parent 91c10aebb3
commit d4d3657b4d

View File

@ -108,7 +108,7 @@ static int it8716f_spi_chip_write_256(struct flashctx *flash, const uint8_t *buf
unsigned int start, unsigned int len); unsigned int start, unsigned int len);
static const struct spi_master spi_master_it87xx = { static const struct spi_master spi_master_it87xx = {
.max_data_read = MAX_DATA_UNSPECIFIED, .max_data_read = 3,
.max_data_write = MAX_DATA_UNSPECIFIED, .max_data_write = MAX_DATA_UNSPECIFIED,
.command = it8716f_spi_send_command, .command = it8716f_spi_send_command,
.multicommand = default_spi_send_multicommand, .multicommand = default_spi_send_multicommand,
@ -380,7 +380,7 @@ static int it8716f_spi_chip_read(struct flashctx *flash, uint8_t *buf,
* via a programmer parameter for the internal programmer. * via a programmer parameter for the internal programmer.
*/ */
if ((flash->chip->total_size * 1024 > 512 * 1024)) { if ((flash->chip->total_size * 1024 > 512 * 1024)) {
spi_read_chunked(flash, buf, start, len, 3); default_spi_read(flash, buf, start, len);
} else { } else {
mmio_readn((void *)(flash->virtual_memory + start), buf, len); mmio_readn((void *)(flash->virtual_memory + start), buf, len);
} }