GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* add a generic preop-opcode-pair table. 

* rename ich_check_opcodes to ich_init_opcodes.

* let ich_init_opcodes do not need to access flashchip structure:
  . move the definition of struct preop_opcode_pair to a better place
  . remove preop_opcode_pairs from 'struct flashchip'
  . modify ich_init_opcodes and generate_opcodes so that they do not access the flashchip structure

* call ich_init_opcodes during chipset enable. Now OPCODES generation mechanism works.

* fix a coding style mistake.

Signed-off-by: FENG yu ning <fengyuning1984@gmail.com>
Acked-by: Peter Stuge <peter@stuge.se>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3814 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
FENG yu ning 2008-12-15 02:32:11 +00:00 committed by Peter Stuge
parent e65dcfa07a
commit a8faa2a479
3 changed files with 32 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
util/flashrom/chipset_enable.c
View File

@ -339,6 +339,7 @@ static int enable_flash_ich_dc_spi(struct pci_dev *dev, const char *name,
printf("WARNING: SPI Configuration Lockdown activated.\n"); printf("WARNING: SPI Configuration Lockdown activated.\n");
ichspi_lock = 1; ichspi_lock = 1;
} }
ich_init_opcodes();
break; break;
case BUS_TYPE_ICH9_SPI: case BUS_TYPE_ICH9_SPI:
tmp2 = *(uint16_t *) (spibar + 0); tmp2 = *(uint16_t *) (spibar + 0);

9
util/flashrom/flash.h
View File

@ -51,12 +51,6 @@
#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
/* for pairing opcodes with their required preop */
struct preop_opcode_pair {
uint8_t preop;
uint8_t opcode;
};
struct flashchip { struct flashchip {
const char *vendor; const char *vendor;
const char *name; const char *name;
@ -82,8 +76,6 @@ struct flashchip {
int (*write) (struct flashchip *flash, uint8_t *buf); int (*write) (struct flashchip *flash, uint8_t *buf);
int (*read) (struct flashchip *flash, uint8_t *buf); int (*read) (struct flashchip *flash, uint8_t *buf);
struct preop_opcode_pair *preop_opcode_pairs;
/* Some flash devices have an additional register space. */ /* Some flash devices have an additional register space. */
volatile uint8_t *virtual_memory; volatile uint8_t *virtual_memory;
volatile uint8_t *virtual_registers; volatile uint8_t *virtual_registers;
@ -537,6 +529,7 @@ int erase_en29f002a(struct flashchip *flash);
int write_en29f002a(struct flashchip *flash, uint8_t *buf); int write_en29f002a(struct flashchip *flash, uint8_t *buf);
/* ichspi.c */ /* ichspi.c */
int ich_init_opcodes();
int ich_spi_command(unsigned int writecnt, unsigned int readcnt, int ich_spi_command(unsigned int writecnt, unsigned int readcnt,
const unsigned char *writearr, unsigned char *readarr); const unsigned char *writearr, unsigned char *readarr);
int ich_spi_read(struct flashchip *flash, uint8_t * buf); int ich_spi_read(struct flashchip *flash, uint8_t * buf);

57
util/flashrom/ichspi.c
View File

@ -152,9 +152,8 @@ static inline uint16_t REGREAD16(int X)
/* Common SPI functions */ /* Common SPI functions */
static inline int find_opcode(OPCODES *op, uint8_t opcode); static inline int find_opcode(OPCODES *op, uint8_t opcode);
static inline int find_preop(OPCODES *op, uint8_t preop); static inline int find_preop(OPCODES *op, uint8_t preop);
static int generate_opcodes(struct flashchip * flash, OPCODES * op); static int generate_opcodes(OPCODES * op);
static int program_opcodes(OPCODES * op); static int program_opcodes(OPCODES * op);
int ich_check_opcodes(struct flashchip * flash);
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);
static int ich_spi_read_page(struct flashchip *flash, uint8_t * buf, static int ich_spi_read_page(struct flashchip *flash, uint8_t * buf,
@ -162,6 +161,23 @@ static int ich_spi_read_page(struct flashchip *flash, uint8_t * buf,
static int ich_spi_write_page(struct flashchip *flash, uint8_t * bytes, static int ich_spi_write_page(struct flashchip *flash, uint8_t * bytes,
int offset, int maxdata); int offset, int maxdata);
/* for pairing opcodes with their required preop */
struct preop_opcode_pair {
uint8_t preop;
uint8_t opcode;
};
struct preop_opcode_pair pops[] = {
{JEDEC_WREN, JEDEC_BYTE_PROGRAM},
{JEDEC_WREN, JEDEC_SE}, /* sector erase */
{JEDEC_WREN, JEDEC_BE_52}, /* block erase */
{JEDEC_WREN, JEDEC_BE_D8}, /* block erase */
{JEDEC_WREN, JEDEC_CE_60}, /* chip erase */
{JEDEC_WREN, JEDEC_CE_C7}, /* chip erase */
{JEDEC_EWSR, JEDEC_WRSR},
{0,}
};
OPCODES O_ST_M25P = { OPCODES O_ST_M25P = {
{ {
JEDEC_WREN, JEDEC_WREN,
@ -204,12 +220,11 @@ static inline int find_preop(OPCODES *op, uint8_t preop)
return -1; return -1;
} }
static int generate_opcodes(struct flashchip * flash, OPCODES * op) static int generate_opcodes(OPCODES * op)
{ {
int a, b, i; int a, b, i;
uint16_t preop, optype; uint16_t preop, optype;
uint32_t opmenu[2]; uint32_t opmenu[2];
struct preop_opcode_pair *pair;
if (op == NULL) { if (op == NULL) {
printf_debug("\n%s: null OPCODES pointer!\n", __FUNCTION__); printf_debug("\n%s: null OPCODES pointer!\n", __FUNCTION__);
@ -257,14 +272,11 @@ static int generate_opcodes(struct flashchip * flash, OPCODES * op)
for (a = 4; a < 8; a++) for (a = 4; a < 8; a++)
op->opcode[a].atomic = 0; op->opcode[a].atomic = 0;
pair = flash->preop_opcode_pairs; for (i = 0; pops[i].opcode; i++) {
if (pair) { a = find_opcode(op, pops[i].opcode);
for (i = 0; pair[i].opcode; i++) { b = find_preop(op, pops[i].preop);
a = find_opcode(op, pair[i].opcode); if ((a != -1) && (b != -1))
b = find_preop(op, pair[i].preop); op->opcode[a].atomic = (uint8_t) ++b;
if ((a != -1) && (b != -1))
op->opcode[a].atomic = (uint8_t) ++b;
}
} }
return 0; return 0;
@ -323,13 +335,12 @@ int program_opcodes(OPCODES * op)
return 0; return 0;
} }
/* This function generates OPCODES from or programs OPCODES to the chipset /* This function generates OPCODES from or programs OPCODES to ICH according to
* according to its SPI configuration lock. * the chipset's SPI configuration lock.
* *
* It should be called in the ICH7/ICH9/VIA part of each operation driver(i.e. * It should be called before ICH sends any spi command.
* probe, read, erase, write, etc.) before any command is sent.
*/ */
int ich_check_opcodes(struct flashchip * flash) int ich_init_opcodes()
{ {
int rc = 0; int rc = 0;
OPCODES *curopcodes_done; OPCODES *curopcodes_done;
@ -340,7 +351,7 @@ int ich_check_opcodes(struct flashchip * flash)
if (ichspi_lock) { if (ichspi_lock) {
printf_debug("Generating OPCODES... "); printf_debug("Generating OPCODES... ");
curopcodes_done = &O_EXISTING; curopcodes_done = &O_EXISTING;
rc = generate_opcodes(flash, curopcodes_done); rc = generate_opcodes(curopcodes_done);
} else { } else {
printf_debug("Programming OPCODES... "); printf_debug("Programming OPCODES... ");
curopcodes_done = &O_ST_M25P; curopcodes_done = &O_ST_M25P;
@ -747,14 +758,6 @@ int ich_spi_command(unsigned int writecnt, unsigned int readcnt,
uint8_t *data; uint8_t *data;
int count; int count;
/* program opcodes if not already done */
if (curopcodes == NULL) {
printf_debug("Programming OPCODES... ");
curopcodes = &O_ST_M25P;
program_opcodes(curopcodes);
printf_debug("done\n");
}
/* find cmd in opcodes-table */ /* find cmd in opcodes-table */
for (a = 0; a < 8; a++) { for (a = 0; a < 8; a++) {
if ((curopcodes->opcode[a]).opcode == cmd) { if ((curopcodes->opcode[a]).opcode == cmd) {