[S] Change in coreboot[master]: soc/intel/skl: Rename ME header with spec version and place it to common

[Dinesh Gehlot (Code Review)]

Dinesh Gehlot has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/72958 )

Change subject: soc/intel/skl: Rename ME header with spec version and place it to common
......................................................................

soc/intel/skl: Rename ME header with spec version and place it to common

Skylake based SoCs uses Intel's Management Engine (ME), version 11. This
patch renames the ME header file to 'me_11.h' and moves the renamed
header to common code.

Including the ME specification in common code will help current and
future SoC platforms to select the correct version based on the
applicable configuration. It might be also beneficial if two different
SoC platforms would like to use the same ME specification and not
necessarily share the same SoC directory.

BUG=b:260309647

Signed-off-by: Dinesh Gehlot 
Change-Id: I30b2e9497e9904cb9f9c2adc86c4d7f62ad0d376
---
M src/soc/intel/common/block/cse/Kconfig
M src/soc/intel/common/block/include/intelblocks/me.h
R src/soc/intel/common/block/include/intelblocks/me_11.h
M src/soc/intel/skylake/Kconfig
M src/soc/intel/skylake/me.c
5 files changed, 33 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/58/72958/1

diff --git a/src/soc/intel/common/block/cse/Kconfig b/src/soc/intel/common/block/cse/Kconfig
index 268dcd4..a7d1e0e5 100644
--- a/src/soc/intel/common/block/cse/Kconfig
+++ b/src/soc/intel/common/block/cse/Kconfig
@@ -206,6 +206,12 @@
    help
     Use this option for CSE FW Update when compressed blobs are used.

+config SOC_INTEL_COMMON_BLOCK_ME_SPEC_11
+	bool
+	help
+	  This config will enable 'ME specification version 11'. It will ensure ME specific
+	  declaration and uses of required data structures for Host firmware status registers.
+
 config SOC_INTEL_COMMON_BLOCK_ME_SPEC_12
    bool
    help
diff --git a/src/soc/intel/common/block/include/intelblocks/me.h b/src/soc/intel/common/block/include/intelblocks/me.h
index c1d12c0..846b159 100644
--- a/src/soc/intel/common/block/include/intelblocks/me.h
+++ b/src/soc/intel/common/block/include/intelblocks/me.h
@@ -5,7 +5,9 @@

#include <stdint.h>

-#if CONFIG(SOC_INTEL_COMMON_BLOCK_ME_SPEC_12)
+#if CONFIG(SOC_INTEL_COMMON_BLOCK_ME_SPEC_11)
+#include "me_11.h"
+#elif CONFIG(SOC_INTEL_COMMON_BLOCK_ME_SPEC_12)
 #include "me_12.h"
 #elif CONFIG(SOC_INTEL_COMMON_BLOCK_ME_SPEC_13)
 #include "me_13.h"
diff --git a/src/soc/intel/skylake/include/soc/me.h b/src/soc/intel/common/block/include/intelblocks/me_11.h
similarity index 100%
rename from src/soc/intel/skylake/include/soc/me.h
rename to src/soc/intel/common/block/include/intelblocks/me_11.h
diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index e15af04..228f1d3 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -66,6 +66,7 @@
    select SOC_INTEL_COMMON_BLOCK_GSPI
    select SOC_INTEL_COMMON_BLOCK_HDA
    select SOC_INTEL_COMMON_BLOCK_HECI1_DISABLE_USING_PCR
+	select SOC_INTEL_COMMON_BLOCK_ME_SPEC_11
    select SOC_INTEL_COMMON_BLOCK_PMC_DISCOVERABLE
    select SOC_INTEL_COMMON_BLOCK_SA
    select SOC_INTEL_COMMON_BLOCK_SCS
diff --git a/src/soc/intel/skylake/me.c b/src/soc/intel/skylake/me.c
index 89491f8..ec53ae7 100644
--- a/src/soc/intel/skylake/me.c
+++ b/src/soc/intel/skylake/me.c
@@ -5,9 +5,9 @@
 #include <commonlib/helpers.h>
 #include <console/console.h>
 #include <device/pci.h>
+#include <intelblocks/me.h>
 #include <intelblocks/cse.h>
 #include <soc/iomap.h>
-#include <soc/me.h>
 #include <soc/pci_devs.h>

/* HFSTS1[3:0] Current Working State Values */