On Mon, Jun 30, 2008 at 10:45:43PM +0200, Rudolf Marek wrote:
This patch adds support for VIA SPI controller on VT8237S. It is similar with few documented exceptions to ICH7 SPI controller.
It has shorter MAXBYTES. And some bits in 0x2 reg are different.
Signed-off-by: Rudolf Marek r.marek@assembler.cz
Acked-by: Peter Stuge peter@stuge.se
Index: coreboot-v2/util/flashrom/chipset_enable.c
--- coreboot-v2.orig/util/flashrom/chipset_enable.c 2008-06-30 22:23:38.519039983 +0200 +++ coreboot-v2/util/flashrom/chipset_enable.c 2008-06-30 22:24:12.279038743 +0200 @@ -187,6 +187,24 @@
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) { uint8_t old, new, bbs, buc; @@ -270,6 +288,7 @@
/* 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) { @@ -660,6 +679,7 @@ {0x1106, 0x8231, "VIA VT8231", enable_flash_vt823x}, {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}, {0x1078, 0x0100, "AMD CS5530(A)", enable_flash_cs5530},
Index: coreboot-v2/util/flashrom/flash.h
--- coreboot-v2.orig/util/flashrom/flash.h 2008-06-30 22:23:29.471039176 +0200 +++ coreboot-v2/util/flashrom/flash.h 2008-06-30 22:23:53.155137207 +0200 @@ -371,6 +371,7 @@ int chipset_flash_enable(void); void print_supported_chipsets(void); extern int ich7_detected; +extern int viaspi_detected; extern int ich9_detected; extern void *ich_spibar;
Index: coreboot-v2/util/flashrom/ichspi.c
--- coreboot-v2.orig/util/flashrom/ichspi.c 2008-06-30 22:23:42.128040739 +0200 +++ coreboot-v2/util/flashrom/ichspi.c 2008-06-30 22:23:53.160040625 +0200 @@ -41,8 +41,6 @@ #include "flash.h" #include "spi.h"
-#define MAXDATABYTES 0x40
/* ICH9 controller register definition */ #define ICH9_REG_FADDR 0x08 /* 32 Bits */ #define ICH9_REG_FDATA0 0x10 /* 64 Bytes */ @@ -81,11 +79,21 @@ #define SPIS_CDS 0x00000004 #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 */ #define ICH7_REG_SPID0 0x08 /* 64 Bytes */ @@ -143,9 +151,9 @@ static int run_opcode(uint8_t nr, OPCODE op, uint32_t offset, 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);
OPCODES O_ST_M25P = { @@ -176,7 +184,7 @@ temp16 = (op->preop[0]); /* 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) { REGWRITE16(ICH9_REG_PREOP, temp16);
@@ -188,7 +196,7 @@ temp16 |= ((uint16_t) op->opcode[a].spi_type) << (a * 2); }
- if (ich7_detected) {
- if ((ich7_detected) || (viaspi_detected)) { REGWRITE16(ICH7_REG_OPTYPE, temp16); } else if (ich9_detected) { REGWRITE16(ICH9_REG_OPTYPE, temp16);
@@ -201,7 +209,7 @@ temp32 |= ((uint32_t) op->opcode[a].opcode) << (a * 8); }
- if (ich7_detected) {
- if ((ich7_detected) || (viaspi_detected)) { REGWRITE32(ICH7_REG_OPMENU, temp32); } else if (ich9_detected) { REGWRITE32(ICH9_REG_OPMENU, temp32);
@@ -215,7 +223,7 @@ ((uint32_t) op->opcode[a].opcode) << ((a - 4) * 8); }
- if (ich7_detected) {
- if ((ich7_detected) || (viaspi_detected)) { REGWRITE32(ICH7_REG_OPMENU + 4, temp32); } else if (ich9_detected) { REGWRITE32(ICH9_REG_OPMENU + 4, temp32);
@@ -225,7 +233,7 @@ }
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; int timeout; @@ -275,7 +283,7 @@
if (datalength != 0) { temp16 |= SPIC_DS;
temp16 |= ((uint16_t) ((datalength - 1) & 0x3f)) << 8;
temp16 |= ((uint32_t) ((datalength - 1) & (maxdata - 1))) << 8;}
/* Select opcode */
@@ -431,10 +439,11 @@ uint8_t datalength, uint8_t * data) { 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 */ return -1;
@@ -455,7 +464,7 @@ return 0; }
-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; uint32_t remaining = flash->page_size; @@ -464,8 +473,8 @@ printf_debug("ich_spi_read_page: offset=%d, number=%d, buf=%p\n", 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 (1, curopcodes->opcode[1],@@ -478,12 +487,12 @@ } else { 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;@@ -491,7 +500,7 @@ }
static int ich_spi_write_page(struct flashchip *flash, uint8_t * bytes,
int offset)
int offset, int maxdata){ int page_size = flash->page_size; uint32_t remaining = page_size; @@ -500,8 +509,8 @@ printf_debug("ich_spi_write_page: offset=%d, number=%d, buf=%p\n", 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], offset + (page_size - remaining), remaining,@@ -513,12 +522,12 @@ } else { 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;@@ -530,10 +539,15 @@ int i, rc = 0; 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);}
return rc;
@@ -545,6 +559,7 @@ int total_size = flash->total_size * 1024; int page_size = flash->page_size; int erase_size = 64 * 1024;
int maxdata = 64;
spi_disable_blockprotect();
@@ -557,9 +572,12 @@ break; }
- 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);Index: coreboot-v2/util/flashrom/spi.c
--- coreboot-v2.orig/util/flashrom/spi.c 2008-06-30 22:23:33.499038553 +0200 +++ coreboot-v2/util/flashrom/spi.c 2008-06-30 22:27:34.391039042 +0200 @@ -36,8 +36,8 @@ { 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);@@ -360,8 +360,8 @@ { 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);@@ -372,8 +372,8 @@ { 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);