Sean Rhodes has uploaded this change for review.

View Change

soc/intel/*/me.c: Check more than PCI interface for printing ME info

Dump the (CS)ME status if it's in a valid state or the PCI device
is enabled.

Signed-off-by: Sean Rhodes <sean@starlabs.systems>
Change-Id: I6ad1215cceb75651b7890f3bab5df39b1b72ecf6
---
M src/soc/intel/alderlake/me.c
M src/soc/intel/cannonlake/me.c
M src/soc/intel/elkhartlake/me.c
M src/soc/intel/icelake/me.c
M src/soc/intel/jasperlake/me.c
M src/soc/intel/skylake/me.c
M src/soc/intel/tigerlake/me.c
7 files changed, 28 insertions(+), 7 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/49/58149/1
diff --git a/src/soc/intel/alderlake/me.c b/src/soc/intel/alderlake/me.c
index da1a299..c9de5fe 100644
--- a/src/soc/intel/alderlake/me.c
+++ b/src/soc/intel/alderlake/me.c
@@ -99,7 +99,10 @@
union me_hfsts5 hfsts5;
union me_hfsts6 hfsts6;

- if (!is_cse_enabled())
+ if (!is_cse_enabled() ||
+ !cse_is_hfs1_cws_normal() ||
+ !cse_is_hfs1_com_normal() ||
+ !cse_is_hfs1_com_soft_temp_disable())
return;

hfsts1.data = me_read_config32(PCI_ME_HFSTS1);
diff --git a/src/soc/intel/cannonlake/me.c b/src/soc/intel/cannonlake/me.c
index 7bbe1ae..04a4b2c 100644
--- a/src/soc/intel/cannonlake/me.c
+++ b/src/soc/intel/cannonlake/me.c
@@ -103,7 +103,10 @@
union me_hfsts5 hfsts5;
union me_hfsts6 hfsts6;

- if (!is_cse_enabled())
+ if (!is_cse_enabled() ||
+ !cse_is_hfs1_cws_normal() ||
+ !cse_is_hfs1_com_normal() ||
+ !cse_is_hfs1_com_soft_temp_disable())
return;

hfsts1.data = me_read_config32(PCI_ME_HFSTS1);
diff --git a/src/soc/intel/elkhartlake/me.c b/src/soc/intel/elkhartlake/me.c
index 5087781..aec1547 100644
--- a/src/soc/intel/elkhartlake/me.c
+++ b/src/soc/intel/elkhartlake/me.c
@@ -14,7 +14,10 @@
union me_hfsts5 hfsts5;
union me_hfsts6 hfsts6;

- if (!is_cse_enabled())
+ if (!is_cse_enabled() ||
+ !cse_is_hfs1_cws_normal() ||
+ !cse_is_hfs1_com_normal() ||
+ !cse_is_hfs1_com_soft_temp_disable())
return;

hfsts1.data = me_read_config32(PCI_ME_HFSTS1);
diff --git a/src/soc/intel/icelake/me.c b/src/soc/intel/icelake/me.c
index c494fa5..29f8714 100644
--- a/src/soc/intel/icelake/me.c
+++ b/src/soc/intel/icelake/me.c
@@ -99,7 +99,10 @@
union me_hfsts5 hfsts5;
union me_hfsts6 hfsts6;

- if (!is_cse_enabled())
+ if (!is_cse_enabled() ||
+ !cse_is_hfs1_cws_normal() ||
+ !cse_is_hfs1_com_normal() ||
+ !cse_is_hfs1_com_soft_temp_disable())
return;

hfsts1.data = me_read_config32(PCI_ME_HFSTS1);
diff --git a/src/soc/intel/jasperlake/me.c b/src/soc/intel/jasperlake/me.c
index b40b4dc..66f4823 100644
--- a/src/soc/intel/jasperlake/me.c
+++ b/src/soc/intel/jasperlake/me.c
@@ -14,7 +14,10 @@
union me_hfsts5 hfsts5;
union me_hfsts6 hfsts6;

- if (!is_cse_enabled())
+ if (!is_cse_enabled() ||
+ !cse_is_hfs1_cws_normal() ||
+ !cse_is_hfs1_com_normal() ||
+ !cse_is_hfs1_com_soft_temp_disable())
return;

hfsts1.data = me_read_config32(PCI_ME_HFSTS1);
diff --git a/src/soc/intel/skylake/me.c b/src/soc/intel/skylake/me.c
index 89491f8..a4bf453 100644
--- a/src/soc/intel/skylake/me.c
+++ b/src/soc/intel/skylake/me.c
@@ -188,7 +188,10 @@
union me_hfsts3 hfs3;
union me_hfsts6 hfs6;

- if (!is_cse_enabled())
+ if (!is_cse_enabled() ||
+ !cse_is_hfs1_cws_normal() ||
+ !cse_is_hfs1_com_normal() ||
+ !cse_is_hfs1_com_soft_temp_disable())
return;

hfs1.data = me_read_config32(PCI_ME_HFSTS1);
diff --git a/src/soc/intel/tigerlake/me.c b/src/soc/intel/tigerlake/me.c
index da1a299..c9de5fe 100644
--- a/src/soc/intel/tigerlake/me.c
+++ b/src/soc/intel/tigerlake/me.c
@@ -99,7 +99,10 @@
union me_hfsts5 hfsts5;
union me_hfsts6 hfsts6;

- if (!is_cse_enabled())
+ if (!is_cse_enabled() ||
+ !cse_is_hfs1_cws_normal() ||
+ !cse_is_hfs1_com_normal() ||
+ !cse_is_hfs1_com_soft_temp_disable())
return;

hfsts1.data = me_read_config32(PCI_ME_HFSTS1);

To view, visit change 58149. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I6ad1215cceb75651b7890f3bab5df39b1b72ecf6
Gerrit-Change-Number: 58149
Gerrit-PatchSet: 1
Gerrit-Owner: Sean Rhodes <admin@starlabs.systems>
Gerrit-MessageType: newchange