Changeset 3399 for trunk/util/flashrom/spi.c

Timestamp:

06/30/08 23:45:17 (5 months ago)

Author:

ruik

Message:

Mine AMIC flash chip needs 4 bytes RDID. Following patch adds support for that.

Signed-off-by: Rudolf Marek <r.marek@…>
Acked-by: Peter Stuge <peter@…>

Files:

• trunk/util/flashrom/spi.c (modified) (5 diffs)

trunk/util/flashrom/spi.c

@@ -45 +45 @@
 }
 
-static int spi_rdid(unsigned char *readarr)
+static int spi_rdid(unsigned char *readarr, int bytes)
 {
         const unsigned char cmd[JEDEC_RDID_OUTSIZE] = {JEDEC_RDID};
 
-        if (spi_command(JEDEC_RDID_OUTSIZE, JEDEC_RDID_INSIZE, cmd, readarr))
+        if (spi_command(JEDEC_RDID_OUTSIZE, bytes, cmd, readarr))
                 return 1;
         printf_debug("RDID returned %02x %02x %02x.\n", readarr[0], readarr[1], readarr[2]);
@@ -81 +81 @@
 }
 
-int probe_spi_rdid(struct flashchip *flash)
-{
-        unsigned char readarr[3];
+static int probe_spi_rdid_generic(struct flashchip *flash, int bytes)
+{
+        unsigned char readarr[4];
         uint32_t manuf_id;
         uint32_t model_id;
 
-        if (spi_rdid(readarr))
+        if (spi_rdid(readarr, bytes))
                 return 0;
 
@@ -99 +99 @@
                 manuf_id = (readarr[0] << 8) | readarr[1];
                 model_id = readarr[2];
+                if (bytes > 3) {
+                        model_id <<= 8;
+                        model_id |= readarr[3];
+                }
         } else {
                 manuf_id = readarr[0];
@@ -124 +128 @@
 }
 
+int probe_spi_rdid(struct flashchip *flash) {
+        return probe_spi_rdid_generic(flash, 3);
+}
+
+/* support 4 bytes flash ID */
+int probe_spi_rdid4(struct flashchip *flash) {
+
+        /* only some SPI chipsets support 4 bytes commands */
+        if (!((ich7_detected) || (ich9_detected) || (viaspi_detected)))
+                return 0;
+        return probe_spi_rdid_generic(flash, 4);
+}
+
 int probe_spi_res(struct flashchip *flash)
 {
@@ -129 +146 @@
         uint32_t model_id;
 
-        if (spi_rdid(readarr))
+        if (spi_rdid(readarr, 3))
                 /* We couldn't issue RDID, it's pointless to try RES. */
                 return 0;