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 <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: FENG yu ning <fengyuning1984@gmail.com>
diff --git a/spi.c b/spi.c
index f676857..a5b85f4 100644
--- a/spi.c
+++ b/spi.c
@@ -160,13 +160,11 @@
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))