Changeset 3418

Timestamp:

07/07/08 08:38:51 (3 months ago)

Author:

stuge

Message:

flashrom: Trivial SPI cleanups

While writing a new SPI driver I fixed some things in the SPI code:
All calls to spi_command() had unneccessary #define duplications, and in some
cases the read count define could theoretically become harmful because NULL was
passed for the read buffer. Avoid a crash, should someone change the #defines.

I also noticed that the only caller of spi_page_program() was the it87 driver,
and spi_page_program() could only call back into the it87 driver. Removed the
function for easier-to-follow code and made it8716f_spi_page_program() static.
The ichspi driver's static page functions are already static.

Signed-off-by: Peter Stuge <peter@…>
Acked-by: Peter Stuge <peter@…>

Location:

trunk/util/flashrom

Files:

• flash.h (modified) (2 diffs)
• it87spi.c (modified) (2 diffs)
• spi.c (modified) (12 diffs)
• spi.h (modified) (1 diff)

trunk/util/flashrom/flash.h

@@ -424 +424 @@
 void spi_disable_blockprotect(void);
 void spi_byte_program(int address, uint8_t byte);
-void spi_page_program(int block, uint8_t *buf, uint8_t *bios);
 void spi_nbyte_read(int address, uint8_t *bytes, int len);
 
@@ -448 +447 @@
 int it8716f_spi_chip_read(struct flashchip *flash, uint8_t *buf);
 int it8716f_spi_chip_write(struct flashchip *flash, uint8_t *buf);
-void it8716f_spi_page_program(int block, uint8_t *buf, uint8_t *bios);
 
 /* jedec.c */

trunk/util/flashrom/it87spi.c

@@ -193 +193 @@
 
 /* Page size is usually 256 bytes */
-void it8716f_spi_page_program(int block, uint8_t *buf, uint8_t *bios) {
+static void it8716f_spi_page_program(int block, uint8_t *buf, uint8_t *bios) {
         int i;
 
@@ -262 +262 @@
         } else {
                 for (i = 0; i < total_size / 256; i++) {
-                        spi_page_program(i, buf, (uint8_t *)flash->virtual_memory);
-                }
-        }
-        return 0;
-}
-
+                        it8716f_spi_page_program(i, buf, (uint8_t *)flash->virtual_memory);
+                }
+        }
+        return 0;
+}
+

trunk/util/flashrom/spi.c

@@ -52 +52 @@
         const unsigned char cmd[JEDEC_RDID_OUTSIZE] = {JEDEC_RDID};
 
-        if (spi_command(JEDEC_RDID_OUTSIZE, bytes, cmd, readarr))
+        if (spi_command(sizeof(cmd), bytes, cmd, readarr))
                 return 1;
         printf_debug("RDID returned %02x %02x %02x.\n", readarr[0], readarr[1], readarr[2]);
@@ -62 +62 @@
         const unsigned char cmd[JEDEC_RES_OUTSIZE] = {JEDEC_RES, 0, 0, 0};
 
-        if (spi_command(JEDEC_RES_OUTSIZE, JEDEC_RES_INSIZE, cmd, readarr))
+        if (spi_command(sizeof(cmd), JEDEC_RES_INSIZE, cmd, readarr))
                 return 1;
         printf_debug("RES returned %02x.\n", readarr[0]);
@@ -73 +73 @@
 
         /* Send WREN (Write Enable) */
-        spi_command(JEDEC_WREN_OUTSIZE, JEDEC_WREN_INSIZE, cmd, NULL);
+        spi_command(sizeof(cmd), 0, cmd, NULL);
 }
 
@@ -81 +81 @@
 
         /* Send WRDI (Write Disable) */
-        spi_command(JEDEC_WRDI_OUTSIZE, JEDEC_WRDI_INSIZE, cmd, NULL);
+        spi_command(sizeof(cmd), 0, cmd, NULL);
 }
 
@@ -183 +183 @@
 {
         const unsigned char cmd[JEDEC_RDSR_OUTSIZE] = {JEDEC_RDSR};
-        unsigned char readarr[1];
+        unsigned char readarr[JEDEC_RDSR_INSIZE];
 
         /* Read Status Register */
-        spi_command(JEDEC_RDSR_OUTSIZE, JEDEC_RDSR_INSIZE, cmd, readarr);
+        spi_command(sizeof(cmd), sizeof(readarr), cmd, readarr);
         return readarr[0];
 }
@@ -274 +274 @@
         spi_write_enable();
         /* Send CE (Chip Erase) */
-        spi_command(JEDEC_CE_C7_OUTSIZE, JEDEC_CE_C7_INSIZE, cmd, NULL);
+        spi_command(sizeof(cmd), 0, cmd, NULL);
         /* Wait until the Write-In-Progress bit is cleared.
          * This usually takes 1-85 s, so wait in 1 s steps.
@@ -297 +297 @@
         spi_write_enable();
         /* Send BE (Block Erase) */
-        spi_command(JEDEC_BE_D8_OUTSIZE, JEDEC_BE_D8_INSIZE, cmd, NULL);
+        spi_command(sizeof(cmd), 0, cmd, NULL);
         /* Wait until the Write-In-Progress bit is cleared.
          * This usually takes 100-4000 ms, so wait in 100 ms steps.
@@ -316 +316 @@
         spi_write_enable();
         /* Send SE (Sector Erase) */
-        spi_command(JEDEC_SE_OUTSIZE, JEDEC_SE_INSIZE, cmd, NULL);
+        spi_command(sizeof(cmd), 0, cmd, NULL);
         /* Wait until the Write-In-Progress bit is cleared.
          * This usually takes 15-800 ms, so wait in 10 ms steps.
@@ -325 +325 @@
 }
 
-void spi_page_program(int block, uint8_t *buf, uint8_t *bios)
-{
-        switch (flashbus) {
-        case BUS_TYPE_IT87XX_SPI:
-                it8716f_spi_page_program(block, buf, bios);
-                break;
-        case BUS_TYPE_ICH7_SPI:
-        case BUS_TYPE_ICH9_SPI:
-                printf_debug("%s called, but not implemented for ICH\n", __FUNCTION__);
-                break;
-        default:
-                printf_debug("%s called, but no SPI chipset/strapping detected\n", __FUNCTION__);
-        }
-}
-
 /*
  * This is according the SST25VF016 datasheet, who knows it is more
@@ -349 +334 @@
 
         /* Send WRSR (Write Status Register) */
-        spi_command(JEDEC_WRSR_OUTSIZE, JEDEC_WRSR_INSIZE, cmd, NULL);
+        spi_command(sizeof(cmd), 0, cmd, NULL);
 }
 
@@ -362 +347 @@
 
         /* Send Byte-Program */
-        spi_command(JEDEC_BYTE_PROGRAM_OUTSIZE, JEDEC_BYTE_PROGRAM_INSIZE, cmd, NULL);
+        spi_command(sizeof(cmd), 0, cmd, NULL);
 }
 
@@ -387 +372 @@
 
         /* Send Read */
-        spi_command(JEDEC_READ_OUTSIZE, len, cmd, bytes);
+        spi_command(sizeof(cmd), len, cmd, bytes);
 }
 

trunk/util/flashrom/spi.h

@@ -50 +50 @@
 #define JEDEC_CE_60_INSIZE      0x00
 
-/* Chip Erase 0xc7 is supported by ST/EON/Macronix chips. */
+/* Chip Erase 0xc7 is supported by SST/ST/EON/Macronix chips. */
 #define JEDEC_CE_C7             0xc7
 #define JEDEC_CE_C7_OUTSIZE     0x01