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

SPI: opmenu special case for WREN as atomic prefix 

The code that attempts to use the opmenu needs to have a special
case for write enable now that it is handled as an atomic prefix
and not as a standalone opcode.

To test, ensure that runtime SPI write via ELOG is successful by
checking the event log for a kernel shutdown reason code:

5 | 2012-08-27 11:09:48 | Kernel Event | Clean Shutdown
6 | 2012-08-27 11:09:50 | System boot | 26
7 | 2012-08-27 11:09:50 | System Reset

Change-Id: I527638ef3e2a5ab100192c5be6e6b3b40916295a
Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-on: http://review.coreboot.org/1710
Reviewed-by: Marc Jones <marcj303@gmail.com>
Tested-by: build bot (Jenkins)
This commit is contained in:
Duncan Laurie 2012-08-27 11:10:43 -07:00 committed by Stefan Reinauer
parent 5c103aa8ae
commit a2f1b95340
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/include/spi.h
View File

@ -44,6 +44,9 @@
#define SPI_XFER_BEGIN 0x01 /* Assert CS before transfer */ #define SPI_XFER_BEGIN 0x01 /* Assert CS before transfer */
#define SPI_XFER_END 0x02 /* Deassert CS after transfer */ #define SPI_XFER_END 0x02 /* Deassert CS after transfer */
/* SPI opcodes */
#define SPI_OPCODE_WREN 0x06
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* Representation of a SPI slave, i.e. what we're communicating with. * Representation of a SPI slave, i.e. what we're communicating with.
* *

6
src/southbridge/intel/bd82x6x/spi.c
View File

@ -505,6 +505,10 @@ static int spi_setup_opcode(spi_transaction *trans)
uint8_t optype; uint8_t optype;
uint16_t opcode_index; uint16_t opcode_index;
/* Write Enable is handled as atomic prefix */
if (trans->opcode == SPI_OPCODE_WREN)
return 0;
read_reg(cntlr.opmenu, opmenu, sizeof(opmenu)); read_reg(cntlr.opmenu, opmenu, sizeof(opmenu));
for (opcode_index = 0; opcode_index < cntlr.menubytes; for (opcode_index = 0; opcode_index < cntlr.menubytes;
opcode_index++) { opcode_index++) {
@ -623,7 +627,7 @@ int spi_xfer(struct spi_slave *slave, const void *dout,
if ((with_address = spi_setup_offset(&trans)) < 0) if ((with_address = spi_setup_offset(&trans)) < 0)
return -1; return -1;
if (!ichspi_lock && trans.opcode == 0x06) { if (!ichspi_lock && trans.opcode == SPI_OPCODE_WREN) {
/* /*
* Treat Write Enable as Atomic Pre-Op if possible * Treat Write Enable as Atomic Pre-Op if possible
* in order to prevent the Management Engine from * in order to prevent the Management Engine from