[coreboot-gerrit] Change in coreboot[master]: Revert "soc/intel/common/block/cse: move cse_disable_mei_devices() in...

[Marina Michelle (Code Review)]

Attention is currently required from: Subrata Banik, Matt DeVillier, Paul Menzel, Angel Pons, Patrick Rudolph, Felix Held.
Hello build bot (Jenkins), Subrata Banik, Matt DeVillier, Paul Menzel, Angel Pons, Patrick Rudolph, Felix Held,

I'd like you to do a code review. Please visit

https://review.coreboot.org/c/coreboot/+/62523

to review the following change.

Change subject: Revert "soc/intel/common/block/cse: move cse_disable_mei_devices() into disable_heci.c"
......................................................................

Revert "soc/intel/common/block/cse: move cse_disable_mei_devices() into disable_heci.c"

This reverts commit 148b5456715cc8eebd25878c67ce906b6fc3adce.

Reason for revert: <INSERT REASONING HERE>
Not running

Change-Id: Ifab2dc957a83106b0c777b61297e605cbf607759
---
M src/soc/intel/common/block/cse/cse_eop.c
M src/soc/intel/common/block/cse/disable_heci.c
2 files changed, 19 insertions(+), 20 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/23/62523/1

diff --git a/src/soc/intel/common/block/cse/cse_eop.c b/src/soc/intel/common/block/cse/cse_eop.c
index 0f1d6ca..c17e227 100644
--- a/src/soc/intel/common/block/cse/cse_eop.c
+++ b/src/soc/intel/common/block/cse/cse_eop.c
@@ -10,6 +10,10 @@
 #include <timestamp.h>
 #include <types.h>

+#define PMC_IPC_MEI_DISABLE_ID			0xa9
+#define PMC_IPC_MEI_DISABLE_SUBID_ENABLE	0
+#define PMC_IPC_MEI_DISABLE_SUBID_DISABLE	1
+
 enum cse_eop_result {
    CSE_EOP_RESULT_GLOBAL_RESET_REQUESTED,
    CSE_EOP_RESULT_SUCCESS,
@@ -46,6 +50,21 @@
    return true;
 }

+bool cse_disable_mei_devices(void)
+{
+	struct pmc_ipc_buffer req = { 0 };
+	struct pmc_ipc_buffer rsp;
+	uint32_t cmd;
+
+	cmd = pmc_make_ipc_cmd(PMC_IPC_MEI_DISABLE_ID, PMC_IPC_MEI_DISABLE_SUBID_DISABLE, 0);
+	if (pmc_send_ipc_cmd(cmd, &req, &rsp) != CB_SUCCESS) {
+		printk(BIOS_ERR, "CSE: Failed to disable MEI devices\n");
+		return false;
+	}
+
+	return true;
+}
+
 static enum cse_eop_result cse_send_eop(void)
 {
    enum {
diff --git a/src/soc/intel/common/block/cse/disable_heci.c b/src/soc/intel/common/block/cse/disable_heci.c
index 84a09fd..ab8b3ad 100644
--- a/src/soc/intel/common/block/cse/disable_heci.c
+++ b/src/soc/intel/common/block/cse/disable_heci.c
@@ -10,7 +10,6 @@
 #include <intelblocks/cse.h>
 #include <intelblocks/p2sb.h>
 #include <intelblocks/pcr.h>
-#include <intelblocks/pmc_ipc.h>
 #include <soc/pci_devs.h>
 #include <soc/pcr_ids.h>

@@ -18,31 +17,12 @@
 #define CSME0_BAR	0x0
 #define CSME0_FID	0xb0

-#define PMC_IPC_MEI_DISABLE_ID			0xa9
-#define PMC_IPC_MEI_DISABLE_SUBID_ENABLE	0
-#define PMC_IPC_MEI_DISABLE_SUBID_DISABLE	1
-
 /* Disable HECI using PCR */
 static void heci1_disable_using_pcr(void)
 {
    soc_disable_heci1_using_pcr();
 }

-bool cse_disable_mei_devices(void)
-{
-	struct pmc_ipc_buffer req = { 0 };
-	struct pmc_ipc_buffer rsp;
-	uint32_t cmd;
-
-	cmd = pmc_make_ipc_cmd(PMC_IPC_MEI_DISABLE_ID, PMC_IPC_MEI_DISABLE_SUBID_DISABLE, 0);
-	if (pmc_send_ipc_cmd(cmd, &req, &rsp) != CB_SUCCESS) {
-		printk(BIOS_ERR, "CSE: Failed to disable MEI devices\n");
-		return false;
-	}
-
-	return true;
-}
-
 /* Disable HECI using PMC IPC communication */
 static void heci1_disable_using_pmc(void)
 {