summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/soc/intel/alderlake/reset.c2
-rw-r--r--src/soc/intel/cannonlake/reset.c2
-rw-r--r--src/soc/intel/common/block/cse/cse.c12
-rw-r--r--src/soc/intel/common/block/include/intelblocks/cse.h6
-rw-r--r--src/soc/intel/elkhartlake/reset.c2
-rw-r--r--src/soc/intel/icelake/reset.c2
-rw-r--r--src/soc/intel/jasperlake/reset.c2
-rw-r--r--src/soc/intel/skylake/me.c2
-rw-r--r--src/soc/intel/tigerlake/reset.c2
9 files changed, 18 insertions, 14 deletions
diff --git a/src/soc/intel/alderlake/reset.c b/src/soc/intel/alderlake/reset.c
index d37ff5407a..1f7ea3c180 100644
--- a/src/soc/intel/alderlake/reset.c
+++ b/src/soc/intel/alderlake/reset.c
@@ -11,7 +11,7 @@
void do_global_reset(void)
{
/* Ask CSE to do the global reset */
- if (cse_request_global_reset(GLOBAL_RESET))
+ if (cse_request_global_reset())
return;
/* global reset if CSE fail to reset */
diff --git a/src/soc/intel/cannonlake/reset.c b/src/soc/intel/cannonlake/reset.c
index d37ff5407a..1f7ea3c180 100644
--- a/src/soc/intel/cannonlake/reset.c
+++ b/src/soc/intel/cannonlake/reset.c
@@ -11,7 +11,7 @@
void do_global_reset(void)
{
/* Ask CSE to do the global reset */
- if (cse_request_global_reset(GLOBAL_RESET))
+ if (cse_request_global_reset())
return;
/* global reset if CSE fail to reset */
diff --git a/src/soc/intel/common/block/cse/cse.c b/src/soc/intel/common/block/cse/cse.c
index 4b598e20b8..ef6db3da4f 100644
--- a/src/soc/intel/common/block/cse/cse.c
+++ b/src/soc/intel/common/block/cse/cse.c
@@ -616,9 +616,10 @@ static bool cse_is_global_reset_allowed(void)
}
/*
- * Sends GLOBAL_RESET_REQ cmd to CSE.The reset type can be GLOBAL_RESET/CSE_RESET_ONLY.
+ * Sends GLOBAL_RESET_REQ cmd to CSE with reset type GLOBAL_RESET.
+ * Returns 0 on failure and 1 on success.
*/
-int cse_request_global_reset(enum rst_req_type rst_type)
+static int cse_request_reset(enum rst_req_type rst_type)
{
int status;
struct mkhi_hdr reply;
@@ -644,7 +645,7 @@ int cse_request_global_reset(enum rst_req_type rst_type)
return 0;
}
- if (!cse_is_global_reset_allowed()) {
+ if (!cse_is_global_reset_allowed() || !is_cse_enabled()) {
printk(BIOS_ERR, "HECI: CSE does not meet required prerequisites\n");
return 0;
}
@@ -663,6 +664,11 @@ int cse_request_global_reset(enum rst_req_type rst_type)
return status;
}
+int cse_request_global_reset(void)
+{
+ return cse_request_reset(GLOBAL_RESET);
+}
+
static bool cse_is_hmrfpo_enable_allowed(void)
{
/*
diff --git a/src/soc/intel/common/block/include/intelblocks/cse.h b/src/soc/intel/common/block/include/intelblocks/cse.h
index a67010cb7a..f554933ef4 100644
--- a/src/soc/intel/common/block/include/intelblocks/cse.h
+++ b/src/soc/intel/common/block/include/intelblocks/cse.h
@@ -121,12 +121,10 @@ enum rst_req_type {
};
/*
- * Sends GLOBAL_RESET_REQ cmd to CSE.
- * The reset type can be one of the above defined reset type.
+ * Sends GLOBAL_RESET_REQ cmd to CSE with reset type GLOBAL_RESET.
* Returns 0 on failure and 1 on success.
*/
-int cse_request_global_reset(enum rst_req_type rst_type);
-
+int cse_request_global_reset(void);
/*
* Sends HMRFPO_ENABLE command.
* HMRFPO - Host ME Region Flash Protection Override.
diff --git a/src/soc/intel/elkhartlake/reset.c b/src/soc/intel/elkhartlake/reset.c
index 107db5accb..fe3d7690b5 100644
--- a/src/soc/intel/elkhartlake/reset.c
+++ b/src/soc/intel/elkhartlake/reset.c
@@ -11,7 +11,7 @@
void do_global_reset(void)
{
/* Ask CSE to do the global reset */
- if (cse_request_global_reset(GLOBAL_RESET))
+ if (cse_request_global_reset())
return;
/* global reset if CSE fail to reset */
diff --git a/src/soc/intel/icelake/reset.c b/src/soc/intel/icelake/reset.c
index d37ff5407a..1f7ea3c180 100644
--- a/src/soc/intel/icelake/reset.c
+++ b/src/soc/intel/icelake/reset.c
@@ -11,7 +11,7 @@
void do_global_reset(void)
{
/* Ask CSE to do the global reset */
- if (cse_request_global_reset(GLOBAL_RESET))
+ if (cse_request_global_reset())
return;
/* global reset if CSE fail to reset */
diff --git a/src/soc/intel/jasperlake/reset.c b/src/soc/intel/jasperlake/reset.c
index d37ff5407a..1f7ea3c180 100644
--- a/src/soc/intel/jasperlake/reset.c
+++ b/src/soc/intel/jasperlake/reset.c
@@ -11,7 +11,7 @@
void do_global_reset(void)
{
/* Ask CSE to do the global reset */
- if (cse_request_global_reset(GLOBAL_RESET))
+ if (cse_request_global_reset())
return;
/* global reset if CSE fail to reset */
diff --git a/src/soc/intel/skylake/me.c b/src/soc/intel/skylake/me.c
index 0d6135fabd..b967d31940 100644
--- a/src/soc/intel/skylake/me.c
+++ b/src/soc/intel/skylake/me.c
@@ -353,7 +353,7 @@ int send_global_reset(void)
goto ret;
/* ME should be in Normal Mode for this command */
- status = cse_request_global_reset(GLOBAL_RESET);
+ status = cse_request_global_reset();
ret:
return status;
}
diff --git a/src/soc/intel/tigerlake/reset.c b/src/soc/intel/tigerlake/reset.c
index d37ff5407a..1f7ea3c180 100644
--- a/src/soc/intel/tigerlake/reset.c
+++ b/src/soc/intel/tigerlake/reset.c
@@ -11,7 +11,7 @@
void do_global_reset(void)
{
/* Ask CSE to do the global reset */
- if (cse_request_global_reset(GLOBAL_RESET))
+ if (cse_request_global_reset())
return;
/* global reset if CSE fail to reset */