From 03adbe12691d512c0d9f28caa93cb35e468fd5d3 Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Sat, 9 May 2009 02:09:45 +0000 Subject: Refine handling of spi_write_enable() failures to fix chip erases on ichspi Until the ICH SPI driver can handle preopcodes as standalone opcodes, we should handle such special opcode failure gracefully on ICH and compatible chipsets. This fixes chip erase on almost all ICH+VIA SPI masters. Thanks to Ali Nadalizadeh for helping track down this bug! Corresponding to flashrom svn r484. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Carl-Daniel Hailfinger --- sb600spi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'sb600spi.c') diff --git a/sb600spi.c b/sb600spi.c index 9a3e99d..095fba1 100644 --- a/sb600spi.c +++ b/sb600spi.c @@ -68,6 +68,7 @@ int sb600_spi_write(struct flashchip *flash, uint8_t *buf) { int rc = 0, i; int total_size = flash->total_size * 1024; + int result; /* Erase first */ printf("Erasing flash before programming... "); @@ -77,7 +78,9 @@ int sb600_spi_write(struct flashchip *flash, uint8_t *buf) printf("Programming flash"); for (i = 0; i < total_size; i++, buf++) { spi_disable_blockprotect(); - spi_write_enable(); + result = spi_write_enable(); + if (result) + return result; spi_byte_program(i, *buf); /* wait program complete. */ if (i % 0x8000 == 0) -- cgit v1.1