[coreboot-gerrit] Change in coreboot[master]: soc/intel/cnl: Rename hfsts into me_hfsts

[Subrata Banik (Code Review)]

Subrata Banik has submitted this change. ( https://review.coreboot.org/c/coreboot/+/39009 )

Change subject: soc/intel/cnl: Rename hfsts into me_hfsts
......................................................................

soc/intel/cnl: Rename hfsts into me_hfsts

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 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/39009
Tested-by: build bot (Jenkins) 
Reviewed-by: Furquan Shaikh 
Reviewed-by: Subrata Banik 
---
M src/soc/intel/cannonlake/me.c
1 file changed, 11 insertions(+), 16 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Furquan Shaikh: Looks good to me, approved
  Subrata Banik: Looks good to me, approved

diff --git a/src/soc/intel/cannonlake/me.c b/src/soc/intel/cannonlake/me.c
index 0414470..3d3fcb8 100644
--- a/src/soc/intel/cannonlake/me.c
+++ b/src/soc/intel/cannonlake/me.c
@@ -32,7 +32,7 @@
 };

/* Host Firmware Status Register 2 */
-union hfsts2 {
+union me_hfsts2 {
    uint32_t raw;
    struct {
    	uint32_t nftp_load_failure	: 1;
@@ -55,13 +55,8 @@
    } __packed fields;
 };

-/* Host Firmware Status Register 3 */
-union hfsts3 {
-	uint32_t raw;
-};
-
 /* Host Firmware Status Register 4 */
-union hfsts4 {
+union me_hfsts4 {
    uint32_t raw;
    struct {
    	uint32_t rsvd0			: 9;
@@ -77,7 +72,7 @@
 };

/* Host Firmware Status Register 5 */
-union hfsts5 {
+union me_hfsts5 {
    uint32_t raw;
    struct {
    	uint32_t acm_active		: 1;
@@ -96,7 +91,7 @@
 };

/* Host Firmware Status Register 6 */
-union hfsts6 {
+union me_hfsts6 {
    uint32_t raw;
    struct {
    	uint32_t force_boot_guard_acm	: 1;
@@ -193,18 +188,18 @@
 void dump_me_status(void *unused)
 {
    union me_hfsts1 hfsts1;
-	union hfsts2 hfsts2;
-	union hfsts3 hfsts3;
-	union hfsts4 hfsts4;
-	union hfsts5 hfsts5;
-	union hfsts6 hfsts6;
+	union me_hfsts2 hfsts2;
+	union me_hfsts3 hfsts3;
+	union me_hfsts4 hfsts4;
+	union me_hfsts5 hfsts5;
+	union me_hfsts6 hfsts6;

if (!is_cse_enabled())
    	return;

hfsts1.data = me_read_config32(PCI_ME_HFSTS1);
    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);
    hfsts5.raw = me_read_config32(PCI_ME_HFSTS5);
    hfsts6.raw = me_read_config32(PCI_ME_HFSTS6);
@@ -214,7 +209,7 @@
    printk(BIOS_DEBUG, "ME: HFSTS2                  : 0x%08X\n",
    	hfsts2.raw);
    printk(BIOS_DEBUG, "ME: HFSTS3                  : 0x%08X\n",
-		hfsts3.raw);
+		hfsts3.data);
    printk(BIOS_DEBUG, "ME: HFSTS4                  : 0x%08X\n",
    	hfsts4.raw);
    printk(BIOS_DEBUG, "ME: HFSTS5                  : 0x%08X\n",