mirror of
https://review.coreboot.org/flashrom.git
synced 2025-04-27 23:22:37 +02:00
Add bus type annotation to struct flashchips
Right now, the annotation only differentiates between SPI and non-SPI. Anyone who knows more about a specific flash chip should feel free to update it. The existing flashbus variable was abused to denote the SPI controller type. Use an aptly named variable for that purpose. Once this patch is merged, the chipset/programmer init functions can set supported flash chip types and flashrom can automatically select only matching probe/read/erase/write functions. A side benefit of that will be the elimination of the Winbond W29EE011 vs. AMIC A49LF040A conflict. Corresponding to flashrom svn r556. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
This commit is contained in:
parent
ebd7b83939
commit
1dfe0ff174
@ -42,8 +42,7 @@ unsigned long flashbase = 0;
|
|||||||
* Eventually, this will become an array when multiple flash support works.
|
* Eventually, this will become an array when multiple flash support works.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
flashbus_t flashbus = BUS_TYPE_LPC;
|
enum chipbustype buses_supported = CHIP_BUSTYPE_UNKNOWN;
|
||||||
void *spibar = NULL;
|
|
||||||
|
|
||||||
extern int ichspi_lock;
|
extern int ichspi_lock;
|
||||||
|
|
||||||
@ -218,7 +217,7 @@ static int enable_flash_vt8237s_spi(struct pci_dev *dev, const char *name)
|
|||||||
printf_debug("0x6c: 0x%04x (CLOCK/DEBUG)\n",
|
printf_debug("0x6c: 0x%04x (CLOCK/DEBUG)\n",
|
||||||
mmio_readw(spibar + 0x6c));
|
mmio_readw(spibar + 0x6c));
|
||||||
|
|
||||||
flashbus = BUS_TYPE_VIA_SPI;
|
spi_controller = SPI_CONTROLLER_VIA;
|
||||||
ich_init_opcodes();
|
ich_init_opcodes();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
@ -269,17 +268,17 @@ static int enable_flash_ich_dc_spi(struct pci_dev *dev, const char *name,
|
|||||||
|
|
||||||
switch (ich_generation) {
|
switch (ich_generation) {
|
||||||
case 7:
|
case 7:
|
||||||
flashbus = BUS_TYPE_ICH7_SPI;
|
spi_controller = SPI_CONTROLLER_ICH7;
|
||||||
spibar_offset = 0x3020;
|
spibar_offset = 0x3020;
|
||||||
break;
|
break;
|
||||||
case 8:
|
case 8:
|
||||||
flashbus = BUS_TYPE_ICH9_SPI;
|
spi_controller = SPI_CONTROLLER_ICH9;
|
||||||
spibar_offset = 0x3020;
|
spibar_offset = 0x3020;
|
||||||
break;
|
break;
|
||||||
case 9:
|
case 9:
|
||||||
case 10:
|
case 10:
|
||||||
default: /* Future version might behave the same */
|
default: /* Future version might behave the same */
|
||||||
flashbus = BUS_TYPE_ICH9_SPI;
|
spi_controller = SPI_CONTROLLER_ICH9;
|
||||||
spibar_offset = 0x3800;
|
spibar_offset = 0x3800;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -290,8 +289,8 @@ static int enable_flash_ich_dc_spi(struct pci_dev *dev, const char *name,
|
|||||||
/* Assign Virtual Address */
|
/* Assign Virtual Address */
|
||||||
spibar = rcrb + spibar_offset;
|
spibar = rcrb + spibar_offset;
|
||||||
|
|
||||||
switch (flashbus) {
|
switch (spi_controller) {
|
||||||
case BUS_TYPE_ICH7_SPI:
|
case SPI_CONTROLLER_ICH7:
|
||||||
printf_debug("0x00: 0x%04x (SPIS)\n",
|
printf_debug("0x00: 0x%04x (SPIS)\n",
|
||||||
mmio_readw(spibar + 0));
|
mmio_readw(spibar + 0));
|
||||||
printf_debug("0x02: 0x%04x (SPIC)\n",
|
printf_debug("0x02: 0x%04x (SPIC)\n",
|
||||||
@ -329,7 +328,7 @@ static int enable_flash_ich_dc_spi(struct pci_dev *dev, const char *name,
|
|||||||
}
|
}
|
||||||
ich_init_opcodes();
|
ich_init_opcodes();
|
||||||
break;
|
break;
|
||||||
case BUS_TYPE_ICH9_SPI:
|
case SPI_CONTROLLER_ICH9:
|
||||||
tmp2 = mmio_readw(spibar + 4);
|
tmp2 = mmio_readw(spibar + 4);
|
||||||
printf_debug("0x04: 0x%04x (HSFS)\n", tmp2);
|
printf_debug("0x04: 0x%04x (HSFS)\n", tmp2);
|
||||||
printf_debug("FLOCKDN %i, ", (tmp2 >> 15 & 1));
|
printf_debug("FLOCKDN %i, ", (tmp2 >> 15 & 1));
|
||||||
@ -729,7 +728,7 @@ static int enable_flash_sb600(struct pci_dev *dev, const char *name)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (has_spi)
|
if (has_spi)
|
||||||
flashbus = BUS_TYPE_SB600_SPI;
|
spi_controller = SPI_CONTROLLER_SB600;
|
||||||
|
|
||||||
/* Read ROM strap override register. */
|
/* Read ROM strap override register. */
|
||||||
OUTB(0x8f, 0xcd6);
|
OUTB(0x8f, 0xcd6);
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
int dummy_init(void)
|
int dummy_init(void)
|
||||||
{
|
{
|
||||||
printf_debug("%s\n", __func__);
|
printf_debug("%s\n", __func__);
|
||||||
flashbus = BUS_TYPE_DUMMY_SPI;
|
spi_controller = SPI_CONTROLLER_DUMMY;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
39
flash.h
39
flash.h
@ -120,9 +120,21 @@ uint32_t chip_readl(const chipaddr addr);
|
|||||||
|
|
||||||
#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
|
#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
|
||||||
|
|
||||||
|
enum chipbustype {
|
||||||
|
CHIP_BUSTYPE_PARALLEL = 1 << 0,
|
||||||
|
CHIP_BUSTYPE_LPC = 1 << 1,
|
||||||
|
CHIP_BUSTYPE_FWH = 1 << 2,
|
||||||
|
CHIP_BUSTYPE_SPI = 1 << 3,
|
||||||
|
CHIP_BUSTYPE_NONSPI = CHIP_BUSTYPE_PARALLEL | CHIP_BUSTYPE_LPC | CHIP_BUSTYPE_FWH,
|
||||||
|
CHIP_BUSTYPE_UNKNOWN = CHIP_BUSTYPE_PARALLEL | CHIP_BUSTYPE_LPC | CHIP_BUSTYPE_FWH | CHIP_BUSTYPE_SPI,
|
||||||
|
};
|
||||||
|
|
||||||
struct flashchip {
|
struct flashchip {
|
||||||
const char *vendor;
|
const char *vendor;
|
||||||
const char *name;
|
const char *name;
|
||||||
|
|
||||||
|
enum chipbustype bustype;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* With 32bit manufacture_id and model_id we can cover IDs up to
|
* With 32bit manufacture_id and model_id we can cover IDs up to
|
||||||
* (including) the 4th bank of JEDEC JEP106W Standard Manufacturer's
|
* (including) the 4th bank of JEDEC JEP106W Standard Manufacturer's
|
||||||
@ -592,25 +604,12 @@ int board_flash_enable(const char *vendor, const char *part);
|
|||||||
void print_supported_boards(void);
|
void print_supported_boards(void);
|
||||||
|
|
||||||
/* chipset_enable.c */
|
/* chipset_enable.c */
|
||||||
|
extern enum chipbustype buses_supported;
|
||||||
int chipset_flash_enable(void);
|
int chipset_flash_enable(void);
|
||||||
void print_supported_chipsets(void);
|
void print_supported_chipsets(void);
|
||||||
|
|
||||||
extern unsigned long flashbase;
|
extern unsigned long flashbase;
|
||||||
|
|
||||||
typedef enum {
|
|
||||||
BUS_TYPE_LPC,
|
|
||||||
BUS_TYPE_ICH7_SPI,
|
|
||||||
BUS_TYPE_ICH9_SPI,
|
|
||||||
BUS_TYPE_IT87XX_SPI,
|
|
||||||
BUS_TYPE_SB600_SPI,
|
|
||||||
BUS_TYPE_VIA_SPI,
|
|
||||||
BUS_TYPE_WBSIO_SPI,
|
|
||||||
BUS_TYPE_DUMMY_SPI
|
|
||||||
} flashbus_t;
|
|
||||||
|
|
||||||
extern flashbus_t flashbus;
|
|
||||||
extern void *spibar;
|
|
||||||
|
|
||||||
/* physmap.c */
|
/* physmap.c */
|
||||||
void *physmap(const char *descr, unsigned long phys_addr, size_t len);
|
void *physmap(const char *descr, unsigned long phys_addr, size_t len);
|
||||||
void physunmap(void *virt_addr, size_t len);
|
void physunmap(void *virt_addr, size_t len);
|
||||||
@ -691,6 +690,18 @@ int coreboot_init(void);
|
|||||||
extern char *lb_part, *lb_vendor;
|
extern char *lb_part, *lb_vendor;
|
||||||
|
|
||||||
/* spi.c */
|
/* spi.c */
|
||||||
|
enum spi_controller {
|
||||||
|
SPI_CONTROLLER_NONE,
|
||||||
|
SPI_CONTROLLER_ICH7,
|
||||||
|
SPI_CONTROLLER_ICH9,
|
||||||
|
SPI_CONTROLLER_IT87XX,
|
||||||
|
SPI_CONTROLLER_SB600,
|
||||||
|
SPI_CONTROLLER_VIA,
|
||||||
|
SPI_CONTROLLER_WBSIO,
|
||||||
|
SPI_CONTROLLER_DUMMY,
|
||||||
|
};
|
||||||
|
extern enum spi_controller spi_controller;
|
||||||
|
extern void *spibar;
|
||||||
int probe_spi_rdid(struct flashchip *flash);
|
int probe_spi_rdid(struct flashchip *flash);
|
||||||
int probe_spi_rdid4(struct flashchip *flash);
|
int probe_spi_rdid4(struct flashchip *flash);
|
||||||
int probe_spi_rems(struct flashchip *flash);
|
int probe_spi_rems(struct flashchip *flash);
|
||||||
|
172
flashchips.c
172
flashchips.c
File diff suppressed because it is too large
Load Diff
28
ichspi.c
28
ichspi.c
@ -223,15 +223,15 @@ static int generate_opcodes(OPCODES * op)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (flashbus) {
|
switch (spi_controller) {
|
||||||
case BUS_TYPE_ICH7_SPI:
|
case SPI_CONTROLLER_ICH7:
|
||||||
case BUS_TYPE_VIA_SPI:
|
case SPI_CONTROLLER_VIA:
|
||||||
preop = REGREAD16(ICH7_REG_PREOP);
|
preop = REGREAD16(ICH7_REG_PREOP);
|
||||||
optype = REGREAD16(ICH7_REG_OPTYPE);
|
optype = REGREAD16(ICH7_REG_OPTYPE);
|
||||||
opmenu[0] = REGREAD32(ICH7_REG_OPMENU);
|
opmenu[0] = REGREAD32(ICH7_REG_OPMENU);
|
||||||
opmenu[1] = REGREAD32(ICH7_REG_OPMENU + 4);
|
opmenu[1] = REGREAD32(ICH7_REG_OPMENU + 4);
|
||||||
break;
|
break;
|
||||||
case BUS_TYPE_ICH9_SPI:
|
case SPI_CONTROLLER_ICH9:
|
||||||
preop = REGREAD16(ICH9_REG_PREOP);
|
preop = REGREAD16(ICH9_REG_PREOP);
|
||||||
optype = REGREAD16(ICH9_REG_OPTYPE);
|
optype = REGREAD16(ICH9_REG_OPTYPE);
|
||||||
opmenu[0] = REGREAD32(ICH9_REG_OPMENU);
|
opmenu[0] = REGREAD32(ICH9_REG_OPMENU);
|
||||||
@ -305,15 +305,15 @@ int program_opcodes(OPCODES * op)
|
|||||||
}
|
}
|
||||||
|
|
||||||
printf_debug("\n%s: preop=%04x optype=%04x opmenu=%08x%08x\n", __func__, preop, optype, opmenu[0], opmenu[1]);
|
printf_debug("\n%s: preop=%04x optype=%04x opmenu=%08x%08x\n", __func__, preop, optype, opmenu[0], opmenu[1]);
|
||||||
switch (flashbus) {
|
switch (spi_controller) {
|
||||||
case BUS_TYPE_ICH7_SPI:
|
case SPI_CONTROLLER_ICH7:
|
||||||
case BUS_TYPE_VIA_SPI:
|
case SPI_CONTROLLER_VIA:
|
||||||
REGWRITE16(ICH7_REG_PREOP, preop);
|
REGWRITE16(ICH7_REG_PREOP, preop);
|
||||||
REGWRITE16(ICH7_REG_OPTYPE, optype);
|
REGWRITE16(ICH7_REG_OPTYPE, optype);
|
||||||
REGWRITE32(ICH7_REG_OPMENU, opmenu[0]);
|
REGWRITE32(ICH7_REG_OPMENU, opmenu[0]);
|
||||||
REGWRITE32(ICH7_REG_OPMENU + 4, opmenu[1]);
|
REGWRITE32(ICH7_REG_OPMENU + 4, opmenu[1]);
|
||||||
break;
|
break;
|
||||||
case BUS_TYPE_ICH9_SPI:
|
case SPI_CONTROLLER_ICH9:
|
||||||
REGWRITE16(ICH9_REG_PREOP, preop);
|
REGWRITE16(ICH9_REG_PREOP, preop);
|
||||||
REGWRITE16(ICH9_REG_OPTYPE, optype);
|
REGWRITE16(ICH9_REG_OPTYPE, optype);
|
||||||
REGWRITE32(ICH9_REG_OPMENU, opmenu[0]);
|
REGWRITE32(ICH9_REG_OPMENU, opmenu[0]);
|
||||||
@ -599,12 +599,12 @@ static int ich9_run_opcode(OPCODE op, uint32_t offset,
|
|||||||
static int run_opcode(OPCODE op, uint32_t offset,
|
static int run_opcode(OPCODE op, uint32_t offset,
|
||||||
uint8_t datalength, uint8_t * data)
|
uint8_t datalength, uint8_t * data)
|
||||||
{
|
{
|
||||||
switch (flashbus) {
|
switch (spi_controller) {
|
||||||
case BUS_TYPE_VIA_SPI:
|
case SPI_CONTROLLER_VIA:
|
||||||
return ich7_run_opcode(op, offset, datalength, data, 16);
|
return ich7_run_opcode(op, offset, datalength, data, 16);
|
||||||
case BUS_TYPE_ICH7_SPI:
|
case SPI_CONTROLLER_ICH7:
|
||||||
return ich7_run_opcode(op, offset, datalength, data, 64);
|
return ich7_run_opcode(op, offset, datalength, data, 64);
|
||||||
case BUS_TYPE_ICH9_SPI:
|
case SPI_CONTROLLER_ICH9:
|
||||||
return ich9_run_opcode(op, offset, datalength, data);
|
return ich9_run_opcode(op, offset, datalength, data);
|
||||||
default:
|
default:
|
||||||
printf_debug("%s: unsupported chipset\n", __FUNCTION__);
|
printf_debug("%s: unsupported chipset\n", __FUNCTION__);
|
||||||
@ -688,7 +688,7 @@ int ich_spi_read(struct flashchip *flash, uint8_t * buf)
|
|||||||
int page_size = flash->page_size;
|
int page_size = flash->page_size;
|
||||||
int maxdata = 64;
|
int maxdata = 64;
|
||||||
|
|
||||||
if (flashbus == BUS_TYPE_VIA_SPI) {
|
if (spi_controller == SPI_CONTROLLER_VIA) {
|
||||||
maxdata = 16;
|
maxdata = 16;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -723,7 +723,7 @@ int ich_spi_write_256(struct flashchip *flash, uint8_t * buf)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (flashbus == BUS_TYPE_VIA_SPI)
|
if (spi_controller == SPI_CONTROLLER_VIA)
|
||||||
maxdata = 16;
|
maxdata = 16;
|
||||||
|
|
||||||
for (j = 0; j < erase_size / page_size; j++) {
|
for (j = 0; j < erase_size / page_size; j++) {
|
||||||
|
@ -101,7 +101,7 @@ int it87xx_probe_spi_flash(const char *name)
|
|||||||
it8716f_flashport = find_ite_spi_flash_port(ITE_SUPERIO_PORT2);
|
it8716f_flashport = find_ite_spi_flash_port(ITE_SUPERIO_PORT2);
|
||||||
|
|
||||||
if (it8716f_flashport)
|
if (it8716f_flashport)
|
||||||
flashbus = BUS_TYPE_IT87XX_SPI;
|
spi_controller = SPI_CONTROLLER_IT87XX;
|
||||||
|
|
||||||
return (!it8716f_flashport);
|
return (!it8716f_flashport);
|
||||||
}
|
}
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
#include "flash.h"
|
#include "flash.h"
|
||||||
#include "spi.h"
|
#include "spi.h"
|
||||||
|
|
||||||
typedef struct _spi_controller {
|
struct sb600_spi_controller {
|
||||||
unsigned int spi_cntrl0; /* 00h */
|
unsigned int spi_cntrl0; /* 00h */
|
||||||
unsigned int restrictedcmd1; /* 04h */
|
unsigned int restrictedcmd1; /* 04h */
|
||||||
unsigned int restrictedcmd2; /* 08h */
|
unsigned int restrictedcmd2; /* 08h */
|
||||||
@ -34,9 +34,9 @@ typedef struct _spi_controller {
|
|||||||
unsigned int spi_cmdvalue1; /* 14h */
|
unsigned int spi_cmdvalue1; /* 14h */
|
||||||
unsigned int spi_cmdvalue2; /* 18h */
|
unsigned int spi_cmdvalue2; /* 18h */
|
||||||
unsigned int spi_fakeid; /* 1Ch */
|
unsigned int spi_fakeid; /* 1Ch */
|
||||||
} sb600_spi_controller;
|
};
|
||||||
|
|
||||||
sb600_spi_controller *spi_bar = NULL;
|
struct sb600_spi_controller *spi_bar = NULL;
|
||||||
uint8_t *sb600_spibar;
|
uint8_t *sb600_spibar;
|
||||||
|
|
||||||
int sb600_spi_read(struct flashchip *flash, uint8_t *buf)
|
int sb600_spi_read(struct flashchip *flash, uint8_t *buf)
|
||||||
@ -114,7 +114,7 @@ int sb600_spi_command(unsigned int writecnt, unsigned int readcnt,
|
|||||||
|
|
||||||
writecnt--;
|
writecnt--;
|
||||||
|
|
||||||
spi_bar = (sb600_spi_controller *) sb600_spibar;
|
spi_bar = (struct sb600_spi_controller *) sb600_spibar;
|
||||||
|
|
||||||
printf_debug("%s, cmd=%x, writecnt=%x, readcnt=%x\n",
|
printf_debug("%s, cmd=%x, writecnt=%x, readcnt=%x\n",
|
||||||
__func__, cmd, writecnt, readcnt);
|
__func__, cmd, writecnt, readcnt);
|
||||||
|
83
spi.c
83
spi.c
@ -26,24 +26,27 @@
|
|||||||
#include "flash.h"
|
#include "flash.h"
|
||||||
#include "spi.h"
|
#include "spi.h"
|
||||||
|
|
||||||
|
enum spi_controller spi_controller = SPI_CONTROLLER_NONE;
|
||||||
|
void *spibar = NULL;
|
||||||
|
|
||||||
void spi_prettyprint_status_register(struct flashchip *flash);
|
void spi_prettyprint_status_register(struct flashchip *flash);
|
||||||
|
|
||||||
int spi_command(unsigned int writecnt, unsigned int readcnt,
|
int spi_command(unsigned int writecnt, unsigned int readcnt,
|
||||||
const unsigned char *writearr, unsigned char *readarr)
|
const unsigned char *writearr, unsigned char *readarr)
|
||||||
{
|
{
|
||||||
switch (flashbus) {
|
switch (spi_controller) {
|
||||||
case BUS_TYPE_IT87XX_SPI:
|
case SPI_CONTROLLER_IT87XX:
|
||||||
return it8716f_spi_command(writecnt, readcnt, writearr,
|
return it8716f_spi_command(writecnt, readcnt, writearr,
|
||||||
readarr);
|
readarr);
|
||||||
case BUS_TYPE_ICH7_SPI:
|
case SPI_CONTROLLER_ICH7:
|
||||||
case BUS_TYPE_ICH9_SPI:
|
case SPI_CONTROLLER_ICH9:
|
||||||
case BUS_TYPE_VIA_SPI:
|
case SPI_CONTROLLER_VIA:
|
||||||
return ich_spi_command(writecnt, readcnt, writearr, readarr);
|
return ich_spi_command(writecnt, readcnt, writearr, readarr);
|
||||||
case BUS_TYPE_SB600_SPI:
|
case SPI_CONTROLLER_SB600:
|
||||||
return sb600_spi_command(writecnt, readcnt, writearr, readarr);
|
return sb600_spi_command(writecnt, readcnt, writearr, readarr);
|
||||||
case BUS_TYPE_WBSIO_SPI:
|
case SPI_CONTROLLER_WBSIO:
|
||||||
return wbsio_spi_command(writecnt, readcnt, writearr, readarr);
|
return wbsio_spi_command(writecnt, readcnt, writearr, readarr);
|
||||||
case BUS_TYPE_DUMMY_SPI:
|
case SPI_CONTROLLER_DUMMY:
|
||||||
return dummy_spi_command(writecnt, readcnt, writearr, readarr);
|
return dummy_spi_command(writecnt, readcnt, writearr, readarr);
|
||||||
default:
|
default:
|
||||||
printf_debug
|
printf_debug
|
||||||
@ -122,10 +125,10 @@ int spi_write_enable(void)
|
|||||||
if (result)
|
if (result)
|
||||||
printf_debug("%s failed", __func__);
|
printf_debug("%s failed", __func__);
|
||||||
if (result == SPI_INVALID_OPCODE) {
|
if (result == SPI_INVALID_OPCODE) {
|
||||||
switch (flashbus) {
|
switch (spi_controller) {
|
||||||
case BUS_TYPE_ICH7_SPI:
|
case SPI_CONTROLLER_ICH7:
|
||||||
case BUS_TYPE_ICH9_SPI:
|
case SPI_CONTROLLER_ICH9:
|
||||||
case BUS_TYPE_VIA_SPI:
|
case SPI_CONTROLLER_VIA:
|
||||||
printf_debug(" due to SPI master limitation, ignoring"
|
printf_debug(" due to SPI master limitation, ignoring"
|
||||||
" and hoping it will be run as PREOP\n");
|
" and hoping it will be run as PREOP\n");
|
||||||
return 0;
|
return 0;
|
||||||
@ -202,13 +205,13 @@ int probe_spi_rdid(struct flashchip *flash)
|
|||||||
int probe_spi_rdid4(struct flashchip *flash)
|
int probe_spi_rdid4(struct flashchip *flash)
|
||||||
{
|
{
|
||||||
/* only some SPI chipsets support 4 bytes commands */
|
/* only some SPI chipsets support 4 bytes commands */
|
||||||
switch (flashbus) {
|
switch (spi_controller) {
|
||||||
case BUS_TYPE_ICH7_SPI:
|
case SPI_CONTROLLER_ICH7:
|
||||||
case BUS_TYPE_ICH9_SPI:
|
case SPI_CONTROLLER_ICH9:
|
||||||
case BUS_TYPE_VIA_SPI:
|
case SPI_CONTROLLER_VIA:
|
||||||
case BUS_TYPE_SB600_SPI:
|
case SPI_CONTROLLER_SB600:
|
||||||
case BUS_TYPE_WBSIO_SPI:
|
case SPI_CONTROLLER_WBSIO:
|
||||||
case BUS_TYPE_DUMMY_SPI:
|
case SPI_CONTROLLER_DUMMY:
|
||||||
return probe_spi_rdid_generic(flash, 4);
|
return probe_spi_rdid_generic(flash, 4);
|
||||||
default:
|
default:
|
||||||
printf_debug("4b ID not supported on this SPI controller\n");
|
printf_debug("4b ID not supported on this SPI controller\n");
|
||||||
@ -281,7 +284,7 @@ uint8_t spi_read_status_register(void)
|
|||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
/* Read Status Register */
|
/* Read Status Register */
|
||||||
if (flashbus == BUS_TYPE_SB600_SPI) {
|
if (spi_controller == SPI_CONTROLLER_SB600) {
|
||||||
/* SB600 uses a different way to read status register. */
|
/* SB600 uses a different way to read status register. */
|
||||||
return sb600_read_status_register();
|
return sb600_read_status_register();
|
||||||
} else {
|
} else {
|
||||||
@ -569,10 +572,10 @@ int spi_write_status_enable(void)
|
|||||||
if (result)
|
if (result)
|
||||||
printf_debug("%s failed", __func__);
|
printf_debug("%s failed", __func__);
|
||||||
if (result == SPI_INVALID_OPCODE) {
|
if (result == SPI_INVALID_OPCODE) {
|
||||||
switch (flashbus) {
|
switch (spi_controller) {
|
||||||
case BUS_TYPE_ICH7_SPI:
|
case SPI_CONTROLLER_ICH7:
|
||||||
case BUS_TYPE_ICH9_SPI:
|
case SPI_CONTROLLER_ICH9:
|
||||||
case BUS_TYPE_VIA_SPI:
|
case SPI_CONTROLLER_VIA:
|
||||||
printf_debug(" due to SPI master limitation, ignoring"
|
printf_debug(" due to SPI master limitation, ignoring"
|
||||||
" and hoping it will be run as PREOP\n");
|
" and hoping it will be run as PREOP\n");
|
||||||
return 0;
|
return 0;
|
||||||
@ -651,16 +654,16 @@ int spi_nbyte_read(int address, uint8_t *bytes, int len)
|
|||||||
|
|
||||||
int spi_chip_read(struct flashchip *flash, uint8_t *buf)
|
int spi_chip_read(struct flashchip *flash, uint8_t *buf)
|
||||||
{
|
{
|
||||||
switch (flashbus) {
|
switch (spi_controller) {
|
||||||
case BUS_TYPE_IT87XX_SPI:
|
case SPI_CONTROLLER_IT87XX:
|
||||||
return it8716f_spi_chip_read(flash, buf);
|
return it8716f_spi_chip_read(flash, buf);
|
||||||
case BUS_TYPE_SB600_SPI:
|
case SPI_CONTROLLER_SB600:
|
||||||
return sb600_spi_read(flash, buf);
|
return sb600_spi_read(flash, buf);
|
||||||
case BUS_TYPE_ICH7_SPI:
|
case SPI_CONTROLLER_ICH7:
|
||||||
case BUS_TYPE_ICH9_SPI:
|
case SPI_CONTROLLER_ICH9:
|
||||||
case BUS_TYPE_VIA_SPI:
|
case SPI_CONTROLLER_VIA:
|
||||||
return ich_spi_read(flash, buf);
|
return ich_spi_read(flash, buf);
|
||||||
case BUS_TYPE_WBSIO_SPI:
|
case SPI_CONTROLLER_WBSIO:
|
||||||
return wbsio_spi_read(flash, buf);
|
return wbsio_spi_read(flash, buf);
|
||||||
default:
|
default:
|
||||||
printf_debug
|
printf_debug
|
||||||
@ -699,16 +702,16 @@ int spi_chip_write_1(struct flashchip *flash, uint8_t *buf)
|
|||||||
*/
|
*/
|
||||||
int spi_chip_write_256(struct flashchip *flash, uint8_t *buf)
|
int spi_chip_write_256(struct flashchip *flash, uint8_t *buf)
|
||||||
{
|
{
|
||||||
switch (flashbus) {
|
switch (spi_controller) {
|
||||||
case BUS_TYPE_IT87XX_SPI:
|
case SPI_CONTROLLER_IT87XX:
|
||||||
return it8716f_spi_chip_write_256(flash, buf);
|
return it8716f_spi_chip_write_256(flash, buf);
|
||||||
case BUS_TYPE_SB600_SPI:
|
case SPI_CONTROLLER_SB600:
|
||||||
return sb600_spi_write_1(flash, buf);
|
return sb600_spi_write_1(flash, buf);
|
||||||
case BUS_TYPE_ICH7_SPI:
|
case SPI_CONTROLLER_ICH7:
|
||||||
case BUS_TYPE_ICH9_SPI:
|
case SPI_CONTROLLER_ICH9:
|
||||||
case BUS_TYPE_VIA_SPI:
|
case SPI_CONTROLLER_VIA:
|
||||||
return ich_spi_write_256(flash, buf);
|
return ich_spi_write_256(flash, buf);
|
||||||
case BUS_TYPE_WBSIO_SPI:
|
case SPI_CONTROLLER_WBSIO:
|
||||||
return wbsio_spi_write_1(flash, buf);
|
return wbsio_spi_write_1(flash, buf);
|
||||||
default:
|
default:
|
||||||
printf_debug
|
printf_debug
|
||||||
@ -731,8 +734,8 @@ int spi_aai_write(struct flashchip *flash, uint8_t *buf)
|
|||||||
unsigned char w[6] = {0xad, 0, 0, 0, buf[0], buf[1]};
|
unsigned char w[6] = {0xad, 0, 0, 0, buf[0], buf[1]};
|
||||||
int result;
|
int result;
|
||||||
|
|
||||||
switch (flashbus) {
|
switch (spi_controller) {
|
||||||
case BUS_TYPE_WBSIO_SPI:
|
case SPI_CONTROLLER_WBSIO:
|
||||||
fprintf(stderr, "%s: impossible with Winbond SPI masters,"
|
fprintf(stderr, "%s: impossible with Winbond SPI masters,"
|
||||||
" degrading to byte program\n", __func__);
|
" degrading to byte program\n", __func__);
|
||||||
return spi_chip_write_1(flash, buf);
|
return spi_chip_write_1(flash, buf);
|
||||||
|
@ -63,7 +63,7 @@ int wbsio_check_for_spi(const char *name)
|
|||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
printf_debug("\nwbsio_spibase = 0x%x\n", wbsio_spibase);
|
printf_debug("\nwbsio_spibase = 0x%x\n", wbsio_spibase);
|
||||||
flashbus = BUS_TYPE_WBSIO_SPI;
|
spi_controller = SPI_CONTROLLER_WBSIO;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user