From 08c77dadf359d42ef99e86647b7b4c73c3cc9f0e Mon Sep 17 00:00:00 2001 From: Rizwan Qureshi Date: Mon, 7 Nov 2022 13:25:10 +0530 Subject: soc/intel/alderlake: Update ME HFSTS register definition Update Alder Lake CSME HFSTS registers definitions as per Intel doc #627331 revision 1.0.0, section 3.4.8. Follow up CLs will use the bit definitions for performing various checks. TEST=build and boot nivviks platform Signed-off-by: Rizwan Qureshi Change-Id: I9aeee7a3b41ad59c03391207930a253ffff19ae5 Reviewed-on: https://review.coreboot.org/c/coreboot/+/69286 Reviewed-by: Sridhar Siricilla Reviewed-by: Eric Lai Tested-by: build bot (Jenkins) --- src/soc/intel/alderlake/include/soc/me.h | 8 +++----- src/soc/intel/alderlake/me.c | 13 +++++-------- 2 files changed, 8 insertions(+), 13 deletions(-) (limited to 'src/soc/intel/alderlake') diff --git a/src/soc/intel/alderlake/include/soc/me.h b/src/soc/intel/alderlake/include/soc/me.h index 8eea095ad4..e094af611d 100644 --- a/src/soc/intel/alderlake/include/soc/me.h +++ b/src/soc/intel/alderlake/include/soc/me.h @@ -35,11 +35,9 @@ union me_hfsts3 { struct { u32 reserved_0: 4; u32 fw_sku: 3; - u32 reserved_7: 2; - u32 reserved_9: 2; - u32 resered_11: 3; - u32 resered_14: 16; - u32 reserved_30: 2; + u32 reserved_7_10: 4; + u32 rpmc_status: 3; + u32 resered_14_31: 18; } __packed fields; }; #endif /* _ALDERLAKE_ME_H_ */ diff --git a/src/soc/intel/alderlake/me.c b/src/soc/intel/alderlake/me.c index 31b09da351..a965807c44 100644 --- a/src/soc/intel/alderlake/me.c +++ b/src/soc/intel/alderlake/me.c @@ -23,7 +23,8 @@ union me_hfsts2 { uint32_t me_power_gate : 1; uint32_t ipu_needed : 1; uint32_t forced_safe_boot : 1; - uint32_t rsvd1 : 2; + uint32_t rsvd1 : 1; + uint32_t cse_to_be_disabled : 1; uint32_t listener_change : 1; uint32_t status_data : 8; uint32_t current_pmevent : 4; @@ -58,10 +59,7 @@ union me_hfsts5 { uint32_t acm_done_sts : 1; uint32_t timeout_count : 7; uint32_t scrtm_indicator : 1; - uint32_t inc_boot_guard_acm : 4; - uint32_t inc_key_manifest : 4; - uint32_t inc_boot_policy : 4; - uint32_t rsvd0 : 2; + uint32_t rsvd0 : 14; uint32_t start_enforcement : 1; } __packed fields; }; @@ -78,9 +76,8 @@ union me_hfsts6 { uint32_t error_enforce_policy : 2; uint32_t measured_boot : 1; uint32_t verified_boot : 1; - uint32_t boot_guard_acmsvn : 4; - uint32_t kmsvn : 4; - uint32_t bpmsvn : 4; + uint32_t rsvd1 : 11; + uint32_t manuf_lock : 1; uint32_t key_manifest_id : 4; uint32_t boot_policy_status : 1; uint32_t error : 1; -- cgit v1.2.3