[S] Change in coreboot[master]: soc/intel/jsl: 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/+/72955 )

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

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

Jasperlake based SoCs uses Intel's Management Engine (ME), version 13.
This patch renames the ME header file to 'me_13.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: I23095279c27328064f0dc5754c3d4b6d8408721b
---
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_13.h
M src/soc/intel/jasperlake/Kconfig
M src/soc/intel/jasperlake/me.c
5 files changed, 33 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/55/72955/1

diff --git a/src/soc/intel/common/block/cse/Kconfig b/src/soc/intel/common/block/cse/Kconfig
index 991fe6c..50807f9 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_13
+	bool
+	help
+	  This config will enable 'ME specification version 13'. It will ensure ME specific
+	  declaration and uses of required data structures for Host firmware status registers.
+
 config SOC_INTEL_COMMON_BLOCK_ME_SPEC_15
    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 08ae06f..ea1b934 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_15)
+#if CONFIG(SOC_INTEL_COMMON_BLOCK_ME_SPEC_13)
+#include "me_13.h"
+#elif CONFIG(SOC_INTEL_COMMON_BLOCK_ME_SPEC_15)
 #include "me_15.h"
 #elif CONFIG(SOC_INTEL_COMMON_BLOCK_ME_SPEC_16)
 #include "me_16.h"
diff --git a/src/soc/intel/jasperlake/include/soc/me.h b/src/soc/intel/common/block/include/intelblocks/me_13.h
similarity index 100%
rename from src/soc/intel/jasperlake/include/soc/me.h
rename to src/soc/intel/common/block/include/intelblocks/me_13.h
diff --git a/src/soc/intel/jasperlake/Kconfig b/src/soc/intel/jasperlake/Kconfig
index 4ae21b8..338c467 100644
--- a/src/soc/intel/jasperlake/Kconfig
+++ b/src/soc/intel/jasperlake/Kconfig
@@ -52,6 +52,7 @@
    select SOC_INTEL_COMMON_BLOCK_GPIO_DUAL_ROUTE_SUPPORT
    select SOC_INTEL_COMMON_BLOCK_GSPI_VERSION_2
    select SOC_INTEL_COMMON_BLOCK_HDA
+	select SOC_INTEL_COMMON_BLOCK_ME_SPEC_13
    select SOC_INTEL_COMMON_BLOCK_SA
    select SOC_INTEL_COMMON_BLOCK_SCS
    select SOC_INTEL_COMMON_BLOCK_SMM
diff --git a/src/soc/intel/jasperlake/me.c b/src/soc/intel/jasperlake/me.c
index b40b4dc..162c0ad 100644
--- a/src/soc/intel/jasperlake/me.c
+++ b/src/soc/intel/jasperlake/me.c
@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only */

#include <bootstate.h>
+#include <intelblocks/me.h>
 #include <intelblocks/cse.h>
 #include <console/console.h>
-#include <soc/me.h>

static void dump_me_status(void *unused)
 {