Attention is currently required from: Tim Wawrzynczak, Patrick Rudolph. Subrata Banik has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/60407 )
Change subject: soc/intel/{adl,ehl,tgl}: Rename spi_protection_mode to mfg_mode ......................................................................
soc/intel/{adl,ehl,tgl}: Rename spi_protection_mode to mfg_mode
Since TGL `spi_protection_mode` bit replaces the previous `manufacturing mode` without changing the offset and purpose of this bit.
This patch renames to `mfg_mode` to maintain the parity with other PCHs as part of IA-common code.
Signed-off-by: Subrata Banik subratabanik@google.com Change-Id: I6d00f72ce7b3951120778733066c351986ccf343 --- M src/soc/intel/alderlake/include/soc/me.h M src/soc/intel/alderlake/me.c M src/soc/intel/elkhartlake/include/soc/me.h M src/soc/intel/elkhartlake/me.c M src/soc/intel/tigerlake/include/soc/me.h M src/soc/intel/tigerlake/me.c 6 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/07/60407/1
diff --git a/src/soc/intel/alderlake/include/soc/me.h b/src/soc/intel/alderlake/include/soc/me.h index 993a3bc..8eea095 100644 --- a/src/soc/intel/alderlake/include/soc/me.h +++ b/src/soc/intel/alderlake/include/soc/me.h @@ -10,7 +10,7 @@ u32 data; struct { u32 working_state: 4; - u32 spi_protection_mode: 1; + u32 mfg_mode: 1; u32 fpt_bad: 1; u32 operation_state: 3; u32 fw_init_complete: 1; diff --git a/src/soc/intel/alderlake/me.c b/src/soc/intel/alderlake/me.c index da1a299..ea94902 100644 --- a/src/soc/intel/alderlake/me.c +++ b/src/soc/intel/alderlake/me.c @@ -121,14 +121,14 @@ * production system to indicate ME Manufacturing mode is disabled. */ printk(BIOS_DEBUG, "ME: Manufacturing Mode : %s\n", - ((hfsts1.fields.spi_protection_mode == 0) && + ((hfsts1.fields.mfg_mode == 0) && (hfsts6.fields.fpf_soc_lock == 1)) ? "NO" : "YES"); /* * The SPI Protection Mode bit reflects SPI descriptor * locked(0) or unlocked(1). */ printk(BIOS_DEBUG, "ME: SPI Protection Mode Enabled : %s\n", - hfsts1.fields.spi_protection_mode ? "NO" : "YES"); + hfsts1.fields.mfg_mode ? "NO" : "YES"); printk(BIOS_DEBUG, "ME: FW Partition Table : %s\n", hfsts1.fields.fpt_bad ? "BAD" : "OK"); printk(BIOS_DEBUG, "ME: Bringup Loader Failure : %s\n", diff --git a/src/soc/intel/elkhartlake/include/soc/me.h b/src/soc/intel/elkhartlake/include/soc/me.h index 8d1021f..d845629 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 spi_protection_mode: 1; + uint32_t mfg_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 5087781..cb70d50 100644 --- a/src/soc/intel/elkhartlake/me.c +++ b/src/soc/intel/elkhartlake/me.c @@ -32,7 +32,7 @@ printk(BIOS_DEBUG, "ME: HFSTS6 : 0x%08X\n", hfsts6.data);
printk(BIOS_DEBUG, "ME: SPI Protection Mode : %s\n", - hfsts1.fields.spi_protection_mode ? "YES" : "NO"); + hfsts1.fields.mfg_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", diff --git a/src/soc/intel/tigerlake/include/soc/me.h b/src/soc/intel/tigerlake/include/soc/me.h index 674ac7e..ed25444 100644 --- a/src/soc/intel/tigerlake/include/soc/me.h +++ b/src/soc/intel/tigerlake/include/soc/me.h @@ -8,7 +8,7 @@ u32 data; struct { u32 working_state: 4; - u32 spi_protection_mode: 1; + u32 mfg_mode: 1; u32 fpt_bad: 1; u32 operation_state: 3; u32 fw_init_complete: 1; diff --git a/src/soc/intel/tigerlake/me.c b/src/soc/intel/tigerlake/me.c index da1a299..ea94902 100644 --- a/src/soc/intel/tigerlake/me.c +++ b/src/soc/intel/tigerlake/me.c @@ -121,14 +121,14 @@ * production system to indicate ME Manufacturing mode is disabled. */ printk(BIOS_DEBUG, "ME: Manufacturing Mode : %s\n", - ((hfsts1.fields.spi_protection_mode == 0) && + ((hfsts1.fields.mfg_mode == 0) && (hfsts6.fields.fpf_soc_lock == 1)) ? "NO" : "YES"); /* * The SPI Protection Mode bit reflects SPI descriptor * locked(0) or unlocked(1). */ printk(BIOS_DEBUG, "ME: SPI Protection Mode Enabled : %s\n", - hfsts1.fields.spi_protection_mode ? "NO" : "YES"); + hfsts1.fields.mfg_mode ? "NO" : "YES"); printk(BIOS_DEBUG, "ME: FW Partition Table : %s\n", hfsts1.fields.fpt_bad ? "BAD" : "OK"); printk(BIOS_DEBUG, "ME: Bringup Loader Failure : %s\n",