Move SPI code out of board_enable.c where it started its life
The SPI chip finding and SPI chip accessor code is moved as well. This
can be split later if we feel like it.
The non-use of svn cp is intentional because the only history we'd
have to preserve are a few commits which were early prototypes of chip
identification code. For those who intend to look at that history, they
can look at board_enable.c revision 2853.
Corresponding to flashrom svn r145 and coreboot v2 svn r2857.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
diff --git a/Makefile b/Makefile
index c6d8108..087a7a5 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
am29f040b.o mx29f002.o sst39sf020.o m29f400bt.o w49f002u.o \
82802ab.o msys_doc.o pm49fl004.o sst49lf040.o sst49lfxxxc.o \
sst_fwhub.o layout.o lbtable.o flashchips.o flashrom.o \
- sharplhf00l04.o w29ee011.o
+ sharplhf00l04.o w29ee011.o spi.o
all: pciutils dep $(PROGRAM)
diff --git a/board_enable.c b/board_enable.c
index 84c6e3a..243251a 100644
--- a/board_enable.c
+++ b/board_enable.c
@@ -30,176 +30,6 @@
#include <string.h>
#include "flash.h"
-#define ITE_SUPERIO_PORT1 0x2e
-#define ITE_SUPERIO_PORT2 0x4e
-
-#define JEDEC_RDID {0x9f}
-#define JEDEC_RDID_OUTSIZE 0x01
-#define JEDEC_RDID_INSIZE 0x03
-
-static uint16_t it8716f_flashport = 0;
-
-/* Generic Super I/O helper functions */
-uint8_t regval(uint16_t port, uint8_t reg)
-{
- outb(reg, port);
- return inb(port + 1);
-}
-
-void regwrite(uint16_t port, uint8_t reg, uint8_t val)
-{
- outb(reg, port);
- outb(val, port + 1);
-}
-
-/* Helper functions for most recent ITE IT87xx Super I/O chips */
-#define CHIP_ID_BYTE1_REG 0x20
-#define CHIP_ID_BYTE2_REG 0x21
-static void enter_conf_mode_ite(uint16_t port)
-{
- outb(0x87, port);
- outb(0x01, port);
- outb(0x55, port);
- if (port == ITE_SUPERIO_PORT1)
- outb(0x55, port);
- else
- outb(0xaa, port);
-}
-
-static void exit_conf_mode_ite(uint16_t port)
-{
- regwrite(port, 0x02, 0x02);
-}
-
-static uint16_t find_ite_serial_flash_port(uint16_t port)
-{
- uint8_t tmp = 0;
- uint16_t id, flashport = 0;
-
- enter_conf_mode_ite(port);
-
- id = regval(port, CHIP_ID_BYTE1_REG) << 8;
- id |= regval(port, CHIP_ID_BYTE2_REG);
-
- /* TODO: Handle more IT87xx if they support flash translation */
- if (id == 0x8716) {
- /* NOLDN, reg 0x24, mask out lowest bit (suspend) */
- tmp = regval(port, 0x24) & 0xFE;
- printf("Serial flash segment 0x%08x-0x%08x %sabled\n",
- 0xFFFE0000, 0xFFFFFFFF, (tmp & 1 << 1) ? "en" : "dis");
- printf("Serial flash segment 0x%08x-0x%08x %sabled\n",
- 0x000E0000, 0x000FFFFF, (tmp & 1 << 1) ? "en" : "dis");
- printf("Serial flash segment 0x%08x-0x%08x %sabled\n",
- 0xFFEE0000, 0xFFEFFFFF, (tmp & 1 << 2) ? "en" : "dis");
- printf("Serial flash segment 0x%08x-0x%08x %sabled\n",
- 0xFFF80000, 0xFFFEFFFF, (tmp & 1 << 3) ? "en" : "dis");
- printf("LPC write to serial flash %sabled\n",
- (tmp & 1 << 4) ? "en" : "dis");
- printf("serial flash pin %i\n", (tmp & 1 << 5) ? 87 : 29);
- /* LDN 0x7, reg 0x64/0x65 */
- regwrite(port, 0x07, 0x7);
- flashport = regval(port, 0x64) << 8;
- flashport |= regval(port, 0x65);
- }
- exit_conf_mode_ite(port);
- return flashport;
-}
-
-/* The IT8716F only supports commands with length 1,2,4,5 bytes including
- command byte and can not read more than 3 bytes from the device.
- This function expects writearr[0] to be the first byte sent to the device,
- whereas the IT8716F splits commands internally into address and non-address
- commands with the address in inverse wire order. That's why the register
- ordering in case 4 and 5 may seem strange. */
-static int it8716f_spi_command(uint16_t port, unsigned char writecnt, unsigned char readcnt, const unsigned char *writearr, unsigned char *readarr)
-{
- uint8_t busy, writeenc;
- do {
- busy = inb(port) & 0x80;
- } while (busy);
- if (readcnt > 3) {
- printf("%s called with unsupported readcnt %i\n",
- __FUNCTION__, readcnt);
- return 1;
- }
- switch (writecnt) {
- case 1:
- outb(writearr[0], port + 1);
- writeenc = 0x0;
- break;
- case 2:
- outb(writearr[0], port + 1);
- outb(writearr[1], port + 7);
- writeenc = 0x1;
- break;
- case 4:
- outb(writearr[0], port + 1);
- outb(writearr[1], port + 4);
- outb(writearr[2], port + 3);
- outb(writearr[3], port + 2);
- writeenc = 0x2;
- break;
- case 5:
- outb(writearr[0], port + 1);
- outb(writearr[1], port + 4);
- outb(writearr[2], port + 3);
- outb(writearr[3], port + 2);
- outb(writearr[4], port + 7);
- writeenc = 0x3;
- break;
- default:
- printf("%s called with unsupported writecnt %i\n",
- __FUNCTION__, writecnt);
- return 1;
- }
- /* Start IO, 33MHz, readcnt input bytes, writecnt output bytes. Note:
- * We can't use writecnt directly, but have to use a strange encoding
- */
- outb((0x5 << 4) | ((readcnt & 0x3) << 2) | (writeenc), port);
- do {
- busy = inb(port) & 0x80;
- } while (busy);
- readarr[0] = inb(port + 5);
- readarr[1] = inb(port + 6);
- readarr[2] = inb(port + 7);
- return 0;
-}
-
-static int it8716f_serial_rdid(uint16_t port, unsigned char *readarr)
-{
- const unsigned char cmd[] = JEDEC_RDID;
-
- if (it8716f_spi_command(port, JEDEC_RDID_OUTSIZE, JEDEC_RDID_INSIZE, cmd, readarr))
- return 1;
- printf("RDID returned %02x %02x %02x\n", readarr[0], readarr[1], readarr[2]);
- return 0;
-}
-
-static int it87xx_probe_serial_flash(const char *name)
-{
- it8716f_flashport = find_ite_serial_flash_port(ITE_SUPERIO_PORT1);
- if (!it8716f_flashport)
- it8716f_flashport = find_ite_serial_flash_port(ITE_SUPERIO_PORT2);
- return (!it8716f_flashport);
-}
-
-int probe_spi(struct flashchip *flash)
-{
- unsigned char readarr[3];
- uint8_t manuf_id;
- uint16_t model_id;
- if (it8716f_flashport) {
- it8716f_serial_rdid(it8716f_flashport, readarr);
- manuf_id = readarr[0];
- model_id = (readarr[1] << 8) | readarr[2];
- printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, manuf_id, model_id);
- if (manuf_id == flash->manufacture_id && model_id == flash->model_id)
- return 1;
- }
-
- return 0;
-}
-
/*
* Helper functions for many Winbond Super I/Os of the W836xx range.
*/
diff --git a/flash.h b/flash.h
index 46f8ad3..6029828 100644
--- a/flash.h
+++ b/flash.h
@@ -207,7 +207,9 @@
int linuxbios_init(void);
extern char *lb_part, *lb_vendor;
+/* spi.c */
int probe_spi(struct flashchip *flash);
+int it87xx_probe_serial_flash(const char *name);
/* 82802ab.c */
int probe_82802ab(struct flashchip *flash);