openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-29 07:53:44 +02:00
Code Issues Releases Wiki Activity

Additionally to WREN also handle WRSR failures gracefully for ICHSPI

Browse Source 
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 status register writes on almost all ICH+VIA SPI masters.

The fix is almost identical to r484, but this time it affects the EWSR
(Enable Write Status Register) opcode instead of the WREN (Write Enable)
opcode.

With the differentiated return codes introduced in r500, the workaround
is more precise this time. The old WREN workaround was updated as well.

Corresponding to flashrom svn r514.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: FENG Yu Ning <fengyuning1984@gmail.com>
Acked-by: Cristi Magherusan <cristi.magherusan@net.utcluj.ro>
This commit is contained in:
Carl-Daniel Hailfinger 2009-05-15 00:56:22 +00:00
parent 530cb2d4f1
commit 1e637844d5
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
spi.c
View File

@ -121,8 +121,10 @@ int spi_write_enable(void)
/* Send WREN (Write Enable) */ /* Send WREN (Write Enable) */
result = spi_command(sizeof(cmd), 0, cmd, NULL); result = spi_command(sizeof(cmd), 0, cmd, NULL);
if (result) {
printf_debug("spi_write_enable failed"); if (result)
printf_debug("%s failed", __func__);
if (result == SPI_INVALID_OPCODE) {
switch (flashbus) { switch (flashbus) {
case BUS_TYPE_ICH7_SPI: case BUS_TYPE_ICH7_SPI:
case BUS_TYPE_ICH9_SPI: case BUS_TYPE_ICH9_SPI:
@ -131,9 +133,12 @@ int spi_write_enable(void)
" and hoping it will be run as PREOP\n"); " and hoping it will be run as PREOP\n");
return 0; return 0;
default: default:
printf_debug("\n"); break;
} }
} }
if (result)
printf_debug("\n");
return result; return result;
} }
@ -561,9 +566,29 @@ int spi_sector_erase(const struct flashchip *flash, unsigned long addr)
int spi_write_status_enable(void) int spi_write_status_enable(void)
{ {
const unsigned char cmd[JEDEC_EWSR_OUTSIZE] = { JEDEC_EWSR }; const unsigned char cmd[JEDEC_EWSR_OUTSIZE] = { JEDEC_EWSR };
int result;
/* Send EWSR (Enable Write Status Register). */ /* Send EWSR (Enable Write Status Register). */
return spi_command(JEDEC_EWSR_OUTSIZE, JEDEC_EWSR_INSIZE, cmd, NULL); result = spi_command(sizeof(cmd), JEDEC_EWSR_INSIZE, cmd, NULL);
if (result)
printf_debug("%s failed", __func__);
if (result == SPI_INVALID_OPCODE) {
switch (flashbus) {
case BUS_TYPE_ICH7_SPI:
case BUS_TYPE_ICH9_SPI:
case BUS_TYPE_VIA_SPI:
printf_debug(" due to SPI master limitation, ignoring"
" and hoping it will be run as PREOP\n");
return 0;
default:
break;
}
}
if (result)
printf_debug("\n");
return result;
} }
/* /*