Changeset 3398

Timestamp:

06/30/08 23:38:30 (3 months ago)

Author:

ruik

Message:

This patch adds support for VIA SPI controller on VT8237S. It is similar with
few documented exceptions to ICH7 SPI controller.

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

Location:

trunk/util/flashrom

Files:

• chipset_enable.c (modified) (3 diffs)
• flash.h (modified) (1 diff)
• ichspi.c (modified) (19 diffs)
• spi.c (modified) (3 diffs)

trunk/util/flashrom/chipset_enable.c

@@ -188 +188 @@
 void *ich_spibar = NULL;
 
+static int enable_flash_vt8237s_spi(struct pci_dev *dev, const char *name) {
+        uint32_t mmio_base;
+
+        mmio_base = (pci_read_long(dev, 0xbc)) << 8;
+        printf_debug("MMIO base at = 0x%x\n", mmio_base);
+        ich_spibar =  mmap(NULL, 0x70, PROT_READ | PROT_WRITE, MAP_SHARED,
+                                fd_mem, mmio_base);
+
+        if (ich_spibar == MAP_FAILED) {
+                perror("Can't mmap memory using " MEM_DEV);
+                exit(1);
+        }
+
+        printf_debug("0x6c: 0x%04x     (CLOCK/DEBUG)\n", *(uint16_t *)(ich_spibar + 0x6c));
+        viaspi_detected = 1;
+        return 0;
+}
+
 static int enable_flash_ich_dc_spi(struct pci_dev *dev, const char *name, unsigned long spibar)
 {
@@ -271 +289 @@
 /* Flag for ICH7 SPI register block */
 int ich7_detected = 0;
+int viaspi_detected = 0;
 
 static int enable_flash_ich7(struct pci_dev *dev, const char *name)
@@ -661 +680 @@
         {0x1106, 0x3177, "VIA VT8235",          enable_flash_vt823x},
         {0x1106, 0x3227, "VIA VT8237",          enable_flash_vt823x},
+        {0x1106, 0x3372, "VIA VT8237S",         enable_flash_vt8237s_spi},
         {0x1106, 0x8324, "VIA CX700",           enable_flash_vt823x},
         {0x1106, 0x0686, "VIA VT82C686",        enable_flash_amd8111},

trunk/util/flashrom/flash.h

@@ -372 +372 @@
 void print_supported_chipsets(void);
 extern int ich7_detected;
+extern int viaspi_detected;
 extern int ich9_detected;
 extern void *ich_spibar;

trunk/util/flashrom/ichspi.c

@@ -42 +42 @@
 #include "spi.h"
 
-#define MAXDATABYTES 0x40
-
 /* ICH9 controller register definition */
 #define ICH9_REG_FADDR         0x08     /* 32 Bits */
@@ -82 +80 @@
 #define SPIS_FCERR             0x00000008
 
+/* VIA SPI is compatible with ICH7, but maxdata
+   to transfer is 16 bytes.
+
+   DATA byte count on ICH7 is 8:13, on VIA 8:11
+
+   bit 12 is port select CS0 CS1
+   bit 13 is FAST READ enable
+   bit 7  is used with fast read and one shot controls CS de-assert?
+*/
+
 #define ICH7_REG_SPIC          0x02     /* 16 Bits */
 #define SPIC_SCGO              0x0002
 #define SPIC_ACS               0x0004
 #define SPIC_SPOP              0x0008
-#define SPIC_DS                        0x4000
+#define SPIC_DS                0x4000
 
 #define ICH7_REG_SPIA          0x04     /* 32 Bits */
@@ -144 +152 @@
                       uint8_t datalength, uint8_t * data);
 static int ich_spi_read_page(struct flashchip *flash, uint8_t * buf,
-                             int offset);
+                             int offset, int maxdata);
 static int ich_spi_write_page(struct flashchip *flash, uint8_t * bytes,
-                              int offset);
+                              int offset, int maxdata);
 static int ich_spi_erase_block(struct flashchip *flash, int offset);
 
@@ -177 +185 @@
         /* 8:16 Prefix Opcode 2 */
         temp16 |= ((uint16_t) op->preop[1]) << 8;
-        if (ich7_detected) {
+        if ((ich7_detected) || (viaspi_detected)) {
                 REGWRITE16(ICH7_REG_PREOP, temp16);
         } else if (ich9_detected) {
@@ -189 +197 @@
         }
 
-        if (ich7_detected) {
+        if ((ich7_detected) || (viaspi_detected)) {
                 REGWRITE16(ICH7_REG_OPTYPE, temp16);
         } else if (ich9_detected) {
@@ -202 +210 @@
         }
 
-        if (ich7_detected) {
+        if ((ich7_detected) || (viaspi_detected)) {
                 REGWRITE32(ICH7_REG_OPMENU, temp32);
         } else if (ich9_detected) {
@@ -216 +224 @@
         }
 
-        if (ich7_detected) {
+        if ((ich7_detected) || (viaspi_detected)) {
                 REGWRITE32(ICH7_REG_OPMENU + 4, temp32);
         } else if (ich9_detected) {
@@ -226 +234 @@
 
 static int ich7_run_opcode(uint8_t nr, OPCODE op, uint32_t offset,
-                           uint8_t datalength, uint8_t * data)
+                           uint8_t datalength, uint8_t * data, int maxdata)
 {
         int write_cmd = 0;
@@ -276 +284 @@
         if (datalength != 0) {
                 temp16 |= SPIC_DS;
-                temp16 |= ((uint16_t) ((datalength - 1) & 0x3f)) << 8;
+                temp16 |= ((uint32_t) ((datalength - 1) & (maxdata - 1))) << 8;
         }
 
@@ -432 +440 @@
 {
         if (ich7_detected)
-                return ich7_run_opcode(nr, op, offset, datalength, data);
-        else if (ich9_detected) {
+                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)
                 return ich9_run_opcode(nr, op, offset, datalength, data);
-        }
 
         /* If we ever get here, something really weird happened */
@@ -456 +465 @@
 }
 
-static int ich_spi_read_page(struct flashchip *flash, uint8_t * buf, int offset)
+static int ich_spi_read_page(struct flashchip *flash, uint8_t * buf, int offset, int maxdata)
 {
         int page_size = flash->page_size;
@@ -465 +474 @@
                      offset, page_size, buf);
 
-        for (a = 0; a < page_size; a += MAXDATABYTES) {
-                if (remaining < MAXDATABYTES) {
+        for (a = 0; a < page_size; a += maxdata) {
+                if (remaining < maxdata) {
 
                         if (run_opcode
@@ -479 +488 @@
                         if (run_opcode
                             (1, curopcodes->opcode[1],
-                             offset + (page_size - remaining), MAXDATABYTES,
+                             offset + (page_size - remaining), maxdata,
                              &buf[page_size - remaining]) != 0) {
                                 printf_debug("Error reading");
                                 return 1;
                         }
-                        remaining -= MAXDATABYTES;
+                        remaining -= maxdata;
                 }
         }
@@ -492 +501 @@
 
 static int ich_spi_write_page(struct flashchip *flash, uint8_t * bytes,
-                              int offset)
+                              int offset, int maxdata)
 {
         int page_size = flash->page_size;
@@ -501 +510 @@
                      offset, page_size, bytes);
 
-        for (a = 0; a < page_size; a += MAXDATABYTES) {
-                if (remaining < MAXDATABYTES) {
+        for (a = 0; a < page_size; a += maxdata) {
+                if (remaining < maxdata) {
                         if (run_opcode
                             (0, curopcodes->opcode[0],
@@ -514 +523 @@
                         if (run_opcode
                             (0, curopcodes->opcode[0],
-                             offset + (page_size - remaining), MAXDATABYTES,
+                             offset + (page_size - remaining), maxdata,
                              &bytes[page_size - remaining]) != 0) {
                                 printf_debug("Error writing");
                                 return 1;
                         }
-                        remaining -= MAXDATABYTES;
+                        remaining -= maxdata;
                 }
         }
@@ -531 +540 @@
         int total_size = flash->total_size * 1024;
         int page_size = flash->page_size;
+        int maxdata = 64;
+
+        if (viaspi_detected) {
+                maxdata = 16;
+        }
 
         for (i = 0; (i < total_size / page_size) && (rc == 0); i++) {
                 rc = ich_spi_read_page(flash, (void *)(buf + i * page_size),
-                                       i * page_size);
+                                       i * page_size, maxdata);
         }
 
@@ -546 +560 @@
         int page_size = flash->page_size;
         int erase_size = 64 * 1024;
+        int maxdata = 64;
 
         spi_disable_blockprotect();
@@ -558 +573 @@
                 }
 
+        if (viaspi_detected) {
+                maxdata = 16;
+        }
                 for (j = 0; j < erase_size / page_size; j++) {
                         ich_spi_write_page(flash, (void *)(buf + (i * erase_size) + (j * page_size)),
-                                           (i * erase_size) + (j * page_size));
+                                           (i * erase_size) + (j * page_size), maxdata);
                 }
         }

trunk/util/flashrom/spi.c

@@ -37 +37 @@
         if (it8716f_flashport)
                 return it8716f_spi_command(writecnt, readcnt, writearr, readarr);
-       else if (ich7_detected)
-               return ich_spi_command(writecnt, readcnt, writearr, readarr);
+        else if ((ich7_detected) || (viaspi_detected))
+                return ich_spi_command(writecnt, readcnt, writearr, readarr);
         else if (ich9_detected)
                 return ich_spi_command(writecnt, readcnt, writearr, readarr);
@@ -361 +361 @@
         if (it8716f_flashport)
                 return it8716f_spi_chip_read(flash, buf);
-       else if (ich7_detected)
-               return ich_spi_read(flash, buf);
+        else if ((ich7_detected) || (viaspi_detected))
+                return ich_spi_read(flash, buf);
         else if (ich9_detected)
                 return ich_spi_read(flash, buf);
@@ -373 +373 @@
         if (it8716f_flashport)
                 return it8716f_spi_chip_write(flash, buf);
-       else if (ich7_detected)
-               return ich_spi_write(flash, buf);
+        else if ((ich7_detected) || (viaspi_detected))
+                return ich_spi_write(flash, buf);
         else if (ich9_detected)
                 return ich_spi_write(flash, buf);