diff options
| author | Subrata Banik <subratabanik@google.com> | 2021-12-27 16:31:24 +0000 |
|---|---|---|
| committer | Subrata Banik <subratabanik@google.com> | 2022-01-02 12:29:07 +0000 |
| commit | 346bb0b01063c740a5517717457885308bb5e660 (patch) | |
| tree | f5b1fcae97c39e1a87ffd428d01149350ed836c1 /src | |
| parent | e065db0dc229a604263dce1cd009bdb4cac51aef (diff) | |
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 `manufacturing mode` aka `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
Reviewed-on: https://review.coreboot.org/c/coreboot/+/60407
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
Reviewed-by: EricR Lai <ericr_lai@compal.corp-partner.google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/soc/intel/alderlake/include/soc/me.h | 2 | ||||
| -rw-r--r-- | src/soc/intel/alderlake/me.c | 4 | ||||
| -rw-r--r-- | src/soc/intel/elkhartlake/include/soc/me.h | 2 | ||||
| -rw-r--r-- | src/soc/intel/elkhartlake/me.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/tigerlake/include/soc/me.h | 2 | ||||
| -rw-r--r-- | src/soc/intel/tigerlake/me.c | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/soc/intel/alderlake/include/soc/me.h b/src/soc/intel/alderlake/include/soc/me.h index 993a3bc29e..8eea095ad4 100644 --- a/src/soc/intel/alderlake/include/soc/me.h +++ b/src/soc/intel/alderlake/include/soc/me.h @@ -10,7 +10,7 @@ union me_hfsts1 { 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 da1a2992e6..ea949025a7 100644 --- a/src/soc/intel/alderlake/me.c +++ b/src/soc/intel/alderlake/me.c @@ -121,14 +121,14 @@ static void dump_me_status(void *unused) * 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 8d1021fc07..d845629e4a 100644 --- a/src/soc/intel/elkhartlake/include/soc/me.h +++ b/src/soc/intel/elkhartlake/include/soc/me.h @@ -8,7 +8,7 @@ union me_hfsts1 { 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 5087781d61..cb70d5028c 100644 --- a/src/soc/intel/elkhartlake/me.c +++ b/src/soc/intel/elkhartlake/me.c @@ -32,7 +32,7 @@ static void dump_me_status(void *unused) 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 674ac7eb89..ed254444b7 100644 --- a/src/soc/intel/tigerlake/include/soc/me.h +++ b/src/soc/intel/tigerlake/include/soc/me.h @@ -8,7 +8,7 @@ union me_hfsts1 { 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 da1a2992e6..ea949025a7 100644 --- a/src/soc/intel/tigerlake/me.c +++ b/src/soc/intel/tigerlake/me.c @@ -121,14 +121,14 @@ static void dump_me_status(void *unused) * 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", |