openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-01 14:11:15 +02:00
Code Issues Releases Wiki Activity

The current ICH SPI preop handling is a hack which spews lots of warnings, but still yields correct results

Browse Source 
With the multicommand infrastructure I introduced in r645, it became
possible to integrate ICH SPI preopcodes cleanly into the flashrom
design.

The new code checks for every opcode in a multicommand array if it is a
preopcode. If yes, it checks if the next opcode is associated with that
preopcode and in that case it simply runs the opcode because the correct
preopcode will be run automatically before the opcode.

Corresponding to flashrom svn r727.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: FENG Yu Ning <fengyuning1984@gmail.com>
This commit is contained in:
Carl-Daniel Hailfinger
2009-09-18 15:50:56 +00:00
parent 707f1ebec3
commit 26f7e64cb1
3 changed files with 47 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
ichspi.c
View File

@ -742,22 +742,29 @@ int ich_spi_send_command(unsigned int writecnt, unsigned int readcnt,
return result;
}
int ich_spi_send_multicommand(struct spi_command *spicommands)
int ich_spi_send_multicommand(struct spi_command *cmds)
{
int ret = 0;
while ((spicommands->writecnt || spicommands->readcnt) && !ret) {
ret = ich_spi_send_command(spicommands->writecnt, spicommands->readcnt,
spicommands->writearr, spicommands->readarr);
/* This awful hack needs to be smarter.
*/
if ((ret == SPI_INVALID_OPCODE) &&
((spicommands->writearr[0] == JEDEC_WREN) ||
(spicommands->writearr[0] == JEDEC_EWSR))) {
printf_debug(" due to SPI master limitation, ignoring"
" and hoping it will be run as PREOP\n");
ret = 0;
}
spicommands++;
int oppos, preoppos;
for (; (cmds->writecnt || cmds->readcnt) && !ret; cmds++) {
/* Is the next command valid or a terminator? */
if ((cmds + 1)->writecnt || (cmds + 1)->readcnt) {
preoppos = find_preop(curopcodes, cmds->writearr[0]);
oppos = find_opcode(curopcodes, (cmds + 1)->writearr[0]);
/* Is the opcode of the current command listed in the
* ICH struct OPCODES as associated preopcode for the
* opcode of the next command?
*/
if ((oppos != -1) && (preoppos != -1) &&
(curopcodes->opcode[oppos].atomic - 1 == preoppos)) {
printf_debug("opcode 0x%02x will be run as PREOP\n",
cmds->writearr[0]);
continue;
}
}
ret = ich_spi_send_command(cmds->writecnt, cmds->readcnt,
cmds->writearr, cmds->readarr);
}
return ret;
}