Changeset 3401 for trunk/util/flashrom/ichspi.c

Timestamp:

07/01/08 01:45:22 (5 months ago)

Author:

stepan

Message:

First attempt to clean up SPI probing and create a common
construct: the flash bus.

At some point the flash bus will be part of struct flashchip.

Pardon me for pushing this in, but I think it is important to beware of further
decay and it will improve things for other developers in the short run.

Carl-Daniel, I will consider your suggestions in another patch. I want to keep
things from getting too much for now. The patch includes Rudolf's VIA SPI
changes though.

Signed-off-by: Stefan Reinauer <stepan@…>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@…>

Files:

• trunk/util/flashrom/ichspi.c (modified) (8 diffs)

trunk/util/flashrom/ichspi.c

@@ -132 +132 @@
 {
         volatile uint32_t regval;
-        regval = *(volatile uint32_t *) ((uint8_t *) ich_spibar + X);
+        regval = *(volatile uint32_t *) ((uint8_t *) spibar + X);
         return regval;
 }
@@ -139 +139 @@
 {
         volatile uint16_t regval;
-        regval = *(volatile uint16_t *) ((uint8_t *) ich_spibar + X);
+        regval = *(volatile uint16_t *) ((uint8_t *) spibar + X);
         return regval;
 }
 
-#define REGWRITE32(X,Y) (*(uint32_t *)((uint8_t *)ich_spibar+X)=Y)
-#define REGWRITE16(X,Y) (*(uint16_t *)((uint8_t *)ich_spibar+X)=Y)
-#define REGWRITE8(X,Y)  (*(uint8_t *)((uint8_t *)ich_spibar+X)=Y)
+#define REGWRITE32(X,Y) (*(uint32_t *)((uint8_t *)spibar+X)=Y)
+#define REGWRITE16(X,Y) (*(uint16_t *)((uint8_t *)spibar+X)=Y)
+#define REGWRITE8(X,Y)  (*(uint8_t *)((uint8_t *)spibar+X)=Y)
 
 /* Common SPI functions */
@@ -176 +176 @@
 {
         uint8_t a;
-        uint16_t temp16;
-        uint32_t temp32;
+        uint16_t preop, optype;
+        uint32_t opmenu[2];
 
         /* Program Prefix Opcodes */
-        temp16 = 0;
+        preop = 0;
         /* 0:7 Prefix Opcode 1 */
-        temp16 = (op->preop[0]);
+        preop = (op->preop[0]);
         /* 8:16 Prefix Opcode 2 */
-        temp16 |= ((uint16_t) op->preop[1]) << 8;
-        if ((ich7_detected) || (viaspi_detected)) {
-                REGWRITE16(ICH7_REG_PREOP, temp16);
-        } else if (ich9_detected) {
-                REGWRITE16(ICH9_REG_PREOP, temp16);
-        }
-
+        preop |= ((uint16_t) op->preop[1]) << 8;
+        
         /* Program Opcode Types 0 - 7 */
-        temp16 = 0;
+        optype = 0;
         for (a = 0; a < 8; a++) {
-                temp16 |= ((uint16_t) op->opcode[a].spi_type) << (a * 2);
-        }
-
-        if ((ich7_detected) || (viaspi_detected)) {
-                REGWRITE16(ICH7_REG_OPTYPE, temp16);
-        } else if (ich9_detected) {
-                REGWRITE16(ICH9_REG_OPTYPE, temp16);
-        }
-
-
+                optype |= ((uint16_t) op->opcode[a].spi_type) << (a * 2);
+        }
+        
         /* Program Allowable Opcodes 0 - 3 */
-        temp32 = 0;
+        opmenu[0] = 0;
         for (a = 0; a < 4; a++) {
-                temp32 |= ((uint32_t) op->opcode[a].opcode) << (a * 8);
-        }
-
-        if ((ich7_detected) || (viaspi_detected)) {
-                REGWRITE32(ICH7_REG_OPMENU, temp32);
-        } else if (ich9_detected) {
-                REGWRITE32(ICH9_REG_OPMENU, temp32);
-        }
-
+                opmenu[0] |= ((uint32_t) op->opcode[a].opcode) << (a * 8);
+        }
 
         /*Program Allowable Opcodes 4 - 7 */
-        temp32 = 0;
+        opmenu[1] = 0;
         for (a = 4; a < 8; a++) {
-                temp32 |=
-                    ((uint32_t) op->opcode[a].opcode) << ((a - 4) * 8);
-        }
-
-        if ((ich7_detected) || (viaspi_detected)) {
-                REGWRITE32(ICH7_REG_OPMENU + 4, temp32);
-        } else if (ich9_detected) {
-                REGWRITE32(ICH9_REG_OPMENU + 4, temp32);
+                opmenu[1] |= ((uint32_t) op->opcode[a].opcode) << ((a - 4) * 8);
+        }
+
+        switch (flashbus) {
+        case BUS_TYPE_ICH7_SPI: 
+        case BUS_TYPE_VIA_SPI: 
+                REGWRITE16(ICH7_REG_PREOP, preop);
+                REGWRITE16(ICH7_REG_OPTYPE, optype);
+                REGWRITE32(ICH7_REG_OPMENU, opmenu[0]);
+                REGWRITE32(ICH7_REG_OPMENU + 4, opmenu[1]);
+                break;
+        case BUS_TYPE_ICH9_SPI:
+                REGWRITE16(ICH9_REG_PREOP, preop);
+                REGWRITE16(ICH9_REG_OPTYPE, optype);
+                REGWRITE32(ICH9_REG_OPMENU, opmenu[0]);
+                REGWRITE32(ICH9_REG_OPMENU + 4, opmenu[1]);
+                break;
+        default:
+                printf_debug("%s: unsupported chipset\n", __FUNCTION__);
+                return -1;
         }
 
@@ -341 +334 @@
 {
         int write_cmd = 0;
+        int timeout;
         uint32_t temp32;
         uint32_t a;
@@ -411 +405 @@
 
         /*wait for cycle complete */
-        while ((REGREAD32(ICH9_REG_SSFS) & SSFS_CDS) == 0) {
-                /*TODO; Do something that this can't lead into an endless loop. but some
-                 * commands may cause this to be last more than 30 seconds */
+        timeout = 1000 * 60;    // 60s is a looong timeout.
+        while (((REGREAD32(ICH9_REG_SSFS) & SSFS_CDS) == 0) && --timeout) {
+                myusec_delay(1000);
+        }
+        if (!timeout) {
+                printf_debug("timeout\n");
         }
 
@@ -439 +436 @@
                       uint8_t datalength, uint8_t * data)
 {
-        if (ich7_detected)
+        switch (flashbus) {
+        case BUS_TYPE_VIA_SPI:
+                return ich7_run_opcode(nr, op, offset, datalength, data, 16);
+        case BUS_TYPE_ICH7_SPI:
                 return ich7_run_opcode(nr, op, offset, datalength, data, 64);
-        else if (viaspi_detected)
-                return ich7_run_opcode(nr, op, offset, datalength, data, 16);
-        else if (ich9_detected)
+        case BUS_TYPE_ICH9_SPI:
                 return ich9_run_opcode(nr, op, offset, datalength, data);
+        default:
+                printf_debug("%s: unsupported chipset\n", __FUNCTION__);
+        }
 
         /* If we ever get here, something really weird happened */
@@ -542 +543 @@
         int maxdata = 64;
 
-        if (viaspi_detected) {
+        if (flashbus == BUS_TYPE_VIA_SPI) {
                 maxdata = 16;
         }
@@ -573 +574 @@
                 }
 
-        if (viaspi_detected) {
+        if (flashbus == BUS_TYPE_VIA_SPI) {
                 maxdata = 16;
         }