GNUBoot/coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

soc/intel/cnl: Rename hfsts into me_hfsts

Browse source 
Remove me_hfs3 union from cnl/me.c since it's already defined in soc/me.h.
Rename below union tags for consistency:
	hfsts2 -> me_hfsts2
	hfsts3 -> me_hfsts3
	hfsts4 -> me_hfsts4
	hfsts5 -> me_hfsts5
	hfsts6 -> me_hfsts6

TEST=Verified on hatch

Change-Id: If81edbad0322425ee3e96c55a9c84a5087604308
Signed-off-by: Sridhar Siricilla <sridhar.siricilla@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/39009
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Subrata Banik <subrata.banik@intel.com>
This commit is contained in:
Sridhar Siricilla 2020-02-19 14:57:04 +05:30 committed by Subrata Banik
parent 4ab7ef93ee
commit 182a0aee3d
1 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/soc/intel/cannonlake/me.c
View file

@ -32,7 +32,7 @@ enum {
}; };
/* Host Firmware Status Register 2 */ /* Host Firmware Status Register 2 */
union hfsts2 { union me_hfsts2 {
uint32_t raw; uint32_t raw;
struct { struct {
uint32_t nftp_load_failure : 1; uint32_t nftp_load_failure : 1;
@ -55,13 +55,8 @@ union hfsts2 {
} __packed fields; } __packed fields;
}; };
/* Host Firmware Status Register 3 */
union hfsts3 {
uint32_t raw;
};
/* Host Firmware Status Register 4 */ /* Host Firmware Status Register 4 */
union hfsts4 { union me_hfsts4 {
uint32_t raw; uint32_t raw;
struct { struct {
uint32_t rsvd0 : 9; uint32_t rsvd0 : 9;
@ -77,7 +72,7 @@ union hfsts4 {
}; };
/* Host Firmware Status Register 5 */ /* Host Firmware Status Register 5 */
union hfsts5 { union me_hfsts5 {
uint32_t raw; uint32_t raw;
struct { struct {
uint32_t acm_active : 1; uint32_t acm_active : 1;
@ -96,7 +91,7 @@ union hfsts5 {
}; };
/* Host Firmware Status Register 6 */ /* Host Firmware Status Register 6 */
union hfsts6 { union me_hfsts6 {
uint32_t raw; uint32_t raw;
struct { struct {
uint32_t force_boot_guard_acm : 1; uint32_t force_boot_guard_acm : 1;
@ -193,18 +188,18 @@ BOOT_STATE_INIT_ENTRY(BS_DEV_ENABLE, BS_ON_EXIT, print_me_version, NULL);
void dump_me_status(void *unused) void dump_me_status(void *unused)
{ {
union me_hfsts1 hfsts1; union me_hfsts1 hfsts1;
union hfsts2 hfsts2; union me_hfsts2 hfsts2;
union hfsts3 hfsts3; union me_hfsts3 hfsts3;
union hfsts4 hfsts4; union me_hfsts4 hfsts4;
union hfsts5 hfsts5; union me_hfsts5 hfsts5;
union hfsts6 hfsts6; union me_hfsts6 hfsts6;
if (!is_cse_enabled()) if (!is_cse_enabled())
return; return;
hfsts1.data = me_read_config32(PCI_ME_HFSTS1); hfsts1.data = me_read_config32(PCI_ME_HFSTS1);
hfsts2.raw = me_read_config32(PCI_ME_HFSTS2); hfsts2.raw = me_read_config32(PCI_ME_HFSTS2);
hfsts3.raw = me_read_config32(PCI_ME_HFSTS3); hfsts3.data = me_read_config32(PCI_ME_HFSTS3);
hfsts4.raw = me_read_config32(PCI_ME_HFSTS4); hfsts4.raw = me_read_config32(PCI_ME_HFSTS4);
hfsts5.raw = me_read_config32(PCI_ME_HFSTS5); hfsts5.raw = me_read_config32(PCI_ME_HFSTS5);
hfsts6.raw = me_read_config32(PCI_ME_HFSTS6); hfsts6.raw = me_read_config32(PCI_ME_HFSTS6);
@ -214,7 +209,7 @@ void dump_me_status(void *unused)
printk(BIOS_DEBUG, "ME: HFSTS2 : 0x%08X\n", printk(BIOS_DEBUG, "ME: HFSTS2 : 0x%08X\n",
hfsts2.raw); hfsts2.raw);
printk(BIOS_DEBUG, "ME: HFSTS3 : 0x%08X\n", printk(BIOS_DEBUG, "ME: HFSTS3 : 0x%08X\n",
hfsts3.raw); hfsts3.data);
printk(BIOS_DEBUG, "ME: HFSTS4 : 0x%08X\n", printk(BIOS_DEBUG, "ME: HFSTS4 : 0x%08X\n",
hfsts4.raw); hfsts4.raw);
printk(BIOS_DEBUG, "ME: HFSTS5 : 0x%08X\n", printk(BIOS_DEBUG, "ME: HFSTS5 : 0x%08X\n",