summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNico Huber <nico.huber@secunet.com>2017-08-31 13:18:49 +0200
committerNico Huber <nico.h@gmx.de>2017-11-04 16:08:01 +0000
commit193013718c44c2684f50ca6acc4950a0fb1a7483 (patch)
tree845adc01e2f08c4f4d5e57bbc17016c2ae6796db
parent22ce83ed99fb28965d265d558c3e28993bfa5fa6 (diff)
downloadflashrom-193013718c44c2684f50ca6acc4950a0fb1a7483.tar.gz
flashrom-193013718c44c2684f50ca6acc4950a0fb1a7483.tar.bz2
flashrom-193013718c44c2684f50ca6acc4950a0fb1a7483.zip
ichspi: Fix software sequencing for Skylake
Two occurences of ICH9_REG_OPMENU were overlooked and not replaced, rendering the software sequencing unusable on Skylake. Change-Id: I16eebcf37ab8ba39b02f33135535552e380b0b92 Signed-off-by: Nico Huber <nico.huber@secunet.com> Reviewed-on: https://review.coreboot.org/22273 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Patrick Rudolph <siro@das-labor.org> (cherry picked from commit 8b2152d54a67e4139525ce49aefe1a6d0e41b85c) Reviewed-on: https://review.coreboot.org/22332 Reviewed-by: Nico Huber <nico.h@gmx.de>
-rw-r--r--ichspi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ichspi.c b/ichspi.c
index 9d6b62b5f..ec81628e1 100644
--- a/ichspi.c
+++ b/ichspi.c
@@ -983,8 +983,8 @@ static int ich9_run_opcode(OPCODE op, uint32_t offset,
}
/* Select opcode */
- opmenu = REGREAD32(ICH9_REG_OPMENU);
- opmenu |= ((uint64_t)REGREAD32(ICH9_REG_OPMENU + 4)) << 32;
+ opmenu = REGREAD32(swseq_data.reg_opmenu);
+ opmenu |= ((uint64_t)REGREAD32(swseq_data.reg_opmenu + 4)) << 32;
for (opcode_index = 0; opcode_index < 8; opcode_index++) {
if ((opmenu & 0xff) == op.opcode) {