path: root/spi.c
diff options
authorCarl-Daniel Hailfinger <>2008-11-27 22:48:48 +0000
committerCarl-Daniel Hailfinger <>2008-11-27 22:48:48 +0000
commit92a54ca0300dd6e0f9773a4313ab489df79020c7 (patch)
tree873b9b570fd7b47fd5ff1aefea826c55e422ac71 /spi.c
parentebaffb6e51fcda2f3a337e86cbce5f5598c19367 (diff)
Try RES even if RDID fails
The existing check in probe_spi_res() was right for SPI controllers which support all commands, but may not exist. For controllers which support only a subset of commands, it will fail in unexpected ways. Even if a command is supported by the controller, it may be unavailable if the controller is locked down. The new logic checks if RDID could be issued and its return values made sense (not 0xff 0xff 0xff). In that case, RES probing is not performed. Otherwise, we try RES. There is one drawback: If RDID returned unexpected values, we don't issue a RES probe. However, in that case we should try to match RDID anyway. Corresponding to flashrom svn r348 and coreboot v2 svn r3774. Signed-off-by: Carl-Daniel Hailfinger <> Acked-by: FENG yu ning <>
Diffstat (limited to 'spi.c')
1 files changed, 5 insertions, 7 deletions
diff --git a/spi.c b/spi.c
index f676857..a5b85f4 100644
--- a/spi.c
+++ b/spi.c
@@ -160,13 +160,11 @@ int probe_spi_res(struct flashchip *flash)
unsigned char readarr[3];
uint32_t model_id;
- if (spi_rdid(readarr, 3))
- /* We couldn't issue RDID, it's pointless to try RES. */
- return 0;
- /* Check if RDID returns 0xff 0xff 0xff, then we use RES. */
- if ((readarr[0] != 0xff) || (readarr[1] != 0xff) ||
- (readarr[2] != 0xff))
+ /* Check if RDID was successful and did not return 0xff 0xff 0xff.
+ * In that case, RES is pointless.
+ */
+ if (!spi_rdid(readarr, 3) && ((readarr[0] != 0xff) ||
+ (readarr[1] != 0xff) || (readarr[2] != 0xff)))
return 0;
if (spi_res(readarr))
OpenPOWER on IntegriCloud