Lean Sheng Tan has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/48539 )
Change subject: soc/intel/elkhartlake: Update HECI Control Status Register settings ......................................................................
soc/intel/elkhartlake: Update HECI Control Status Register settings
For EHL, SpiProtectionMode is added to HFSTS register #1. The original Menufacturing Mode is detected via FpfSocConfigLock instead. If FpfSocConfigLock=1, means it is in Menufacturing Mode, and it is in EOM (End Of Manufacturing) when FpfSocConfigLock=0.
Signed-off-by: Tan, Lean Sheng lean.sheng.tan@intel.com Change-Id: I9d1d004a6b5b276e33be80f02cd1197b88d379ae --- M src/soc/intel/elkhartlake/include/soc/me.h M src/soc/intel/elkhartlake/me.c 2 files changed, 5 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/39/48539/1
diff --git a/src/soc/intel/elkhartlake/include/soc/me.h b/src/soc/intel/elkhartlake/include/soc/me.h index d845629..8d1021f 100644 --- a/src/soc/intel/elkhartlake/include/soc/me.h +++ b/src/soc/intel/elkhartlake/include/soc/me.h @@ -8,7 +8,7 @@ uint32_t data; struct { uint32_t working_state: 4; - uint32_t mfg_mode: 1; + uint32_t spi_protection_mode: 1; uint32_t fpt_bad: 1; uint32_t operation_state: 3; uint32_t fw_init_complete: 1; diff --git a/src/soc/intel/elkhartlake/me.c b/src/soc/intel/elkhartlake/me.c index d00702e..5087781 100644 --- a/src/soc/intel/elkhartlake/me.c +++ b/src/soc/intel/elkhartlake/me.c @@ -31,8 +31,8 @@ printk(BIOS_DEBUG, "ME: HFSTS5 : 0x%08X\n", hfsts5.data); printk(BIOS_DEBUG, "ME: HFSTS6 : 0x%08X\n", hfsts6.data);
- printk(BIOS_DEBUG, "ME: Manufacturing Mode : %s\n", - hfsts1.fields.mfg_mode ? "YES" : "NO"); + printk(BIOS_DEBUG, "ME: SPI Protection Mode : %s\n", + hfsts1.fields.spi_protection_mode ? "YES" : "NO"); printk(BIOS_DEBUG, "ME: FW Partition Table : %s\n", hfsts1.fields.fpt_bad ? "BAD" : "OK"); printk(BIOS_DEBUG, "ME: Bringup Loader Failure : %s\n", @@ -61,6 +61,8 @@ hfsts1.fields.error_code); printk(BIOS_DEBUG, "ME: CPU Debug Disabled : %s\n", hfsts6.fields.cpu_debug_disable ? "YES" : "NO"); + printk(BIOS_DEBUG, "ME: Manufacturing Mode : %s\n", + hfsts6.fields.fpf_soc_lock ? "NO" : "YES"); printk(BIOS_DEBUG, "ME: TXT Support : %s\n", hfsts6.fields.txt_support ? "YES" : "NO"); }
Werner Zeh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48539 )
Change subject: soc/intel/elkhartlake: Update HECI Control Status Register settings ......................................................................
Patch Set 1: Code-Review+1
(1 comment)
https://review.coreboot.org/c/coreboot/+/48539/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/48539/1//COMMIT_MSG@10 PS1, Line 10: Menufacturing Manufacturing
Hello build bot (Jenkins), Frans Hendriks, Maulik V Vaghela, Mario Scheithauer, Subrata Banik, Werner Zeh, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/48539
to look at the new patch set (#2).
Change subject: soc/intel/elkhartlake: Update HECI Control Status Register settings ......................................................................
soc/intel/elkhartlake: Update HECI Control Status Register settings
For EHL, SpiProtectionMode is added to HFSTS register #1. The original Manufacturing Mode is detected via FpfSocConfigLock instead. If FpfSocConfigLock=1, means it is in Menufacturing Mode, and it is in EOM (End Of Manufacturing) when FpfSocConfigLock=0.
Signed-off-by: Tan, Lean Sheng lean.sheng.tan@intel.com Change-Id: I9d1d004a6b5b276e33be80f02cd1197b88d379ae --- M src/soc/intel/elkhartlake/include/soc/me.h M src/soc/intel/elkhartlake/me.c 2 files changed, 5 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/39/48539/2
Lean Sheng Tan has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48539 )
Change subject: soc/intel/elkhartlake: Update HECI Control Status Register settings ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/48539/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/48539/1//COMMIT_MSG@10 PS1, Line 10: Menufacturing
Manufacturing
Done
Frans Hendriks has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48539 )
Change subject: soc/intel/elkhartlake: Update HECI Control Status Register settings ......................................................................
Patch Set 2: Code-Review+1
Werner Zeh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48539 )
Change subject: soc/intel/elkhartlake: Update HECI Control Status Register settings ......................................................................
Patch Set 2: Code-Review+2
Werner Zeh has submitted this change. ( https://review.coreboot.org/c/coreboot/+/48539 )
Change subject: soc/intel/elkhartlake: Update HECI Control Status Register settings ......................................................................
soc/intel/elkhartlake: Update HECI Control Status Register settings
For EHL, SpiProtectionMode is added to HFSTS register #1. The original Manufacturing Mode is detected via FpfSocConfigLock instead. If FpfSocConfigLock=1, means it is in Menufacturing Mode, and it is in EOM (End Of Manufacturing) when FpfSocConfigLock=0.
Signed-off-by: Tan, Lean Sheng lean.sheng.tan@intel.com Change-Id: I9d1d004a6b5b276e33be80f02cd1197b88d379ae Reviewed-on: https://review.coreboot.org/c/coreboot/+/48539 Reviewed-by: Frans Hendriks fhendriks@eltan.com Reviewed-by: Werner Zeh werner.zeh@siemens.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/soc/intel/elkhartlake/include/soc/me.h M src/soc/intel/elkhartlake/me.c 2 files changed, 5 insertions(+), 3 deletions(-)
Approvals: build bot (Jenkins): Verified Werner Zeh: Looks good to me, approved Frans Hendriks: Looks good to me, but someone else must approve
diff --git a/src/soc/intel/elkhartlake/include/soc/me.h b/src/soc/intel/elkhartlake/include/soc/me.h index d845629..8d1021f 100644 --- a/src/soc/intel/elkhartlake/include/soc/me.h +++ b/src/soc/intel/elkhartlake/include/soc/me.h @@ -8,7 +8,7 @@ uint32_t data; struct { uint32_t working_state: 4; - uint32_t mfg_mode: 1; + uint32_t spi_protection_mode: 1; uint32_t fpt_bad: 1; uint32_t operation_state: 3; uint32_t fw_init_complete: 1; diff --git a/src/soc/intel/elkhartlake/me.c b/src/soc/intel/elkhartlake/me.c index d00702e..5087781 100644 --- a/src/soc/intel/elkhartlake/me.c +++ b/src/soc/intel/elkhartlake/me.c @@ -31,8 +31,8 @@ printk(BIOS_DEBUG, "ME: HFSTS5 : 0x%08X\n", hfsts5.data); printk(BIOS_DEBUG, "ME: HFSTS6 : 0x%08X\n", hfsts6.data);
- printk(BIOS_DEBUG, "ME: Manufacturing Mode : %s\n", - hfsts1.fields.mfg_mode ? "YES" : "NO"); + printk(BIOS_DEBUG, "ME: SPI Protection Mode : %s\n", + hfsts1.fields.spi_protection_mode ? "YES" : "NO"); printk(BIOS_DEBUG, "ME: FW Partition Table : %s\n", hfsts1.fields.fpt_bad ? "BAD" : "OK"); printk(BIOS_DEBUG, "ME: Bringup Loader Failure : %s\n", @@ -61,6 +61,8 @@ hfsts1.fields.error_code); printk(BIOS_DEBUG, "ME: CPU Debug Disabled : %s\n", hfsts6.fields.cpu_debug_disable ? "YES" : "NO"); + printk(BIOS_DEBUG, "ME: Manufacturing Mode : %s\n", + hfsts6.fields.fpf_soc_lock ? "NO" : "YES"); printk(BIOS_DEBUG, "ME: TXT Support : %s\n", hfsts6.fields.txt_support ? "YES" : "NO"); }