Kyösti Mälkki has uploaded this change for review.

View Change

sb,soc/intel: Remove redundant GNVS check

With gnvs_ptr assigned in SMM module loader already,
gnvs is always non-NULL on entry to SMI handler.

For !SMM_TSEG GNVS is not available for SMI handler.

Change-Id: Id5dbfa6089055ce14fd24fcb059714b845483617
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
---
M src/soc/intel/broadwell/pch/smihandler.c
M src/soc/intel/common/block/smm/smitraphandler.c
M src/southbridge/intel/bd82x6x/smihandler.c
M src/southbridge/intel/i82801gx/smihandler.c
M src/southbridge/intel/i82801ix/smihandler.c
M src/southbridge/intel/i82801jx/smihandler.c
M src/southbridge/intel/ibexpeak/smihandler.c
M src/southbridge/intel/lynxpoint/smihandler.c
8 files changed, 8 insertions(+), 13 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/00/48700/1

diff --git a/src/soc/intel/broadwell/pch/smihandler.c b/src/soc/intel/broadwell/pch/smihandler.c
index 5ed52d8..d3138e9 100644
--- a/src/soc/intel/broadwell/pch/smihandler.c
+++ b/src/soc/intel/broadwell/pch/smihandler.c
@@ -443,7 +443,7 @@
 
 	/* IOTRAP(3) SMI function call */
 	if (IOTRAP(3)) {
-		if (gnvs && gnvs->smif)
+		if (gnvs->smif)
 			io_trap_handler(gnvs->smif); // call function smif
 		return;
 	}
diff --git a/src/soc/intel/common/block/smm/smitraphandler.c b/src/soc/intel/common/block/smm/smitraphandler.c
index 99825f1..c6e28af 100644
--- a/src/soc/intel/common/block/smm/smitraphandler.c
+++ b/src/soc/intel/common/block/smm/smitraphandler.c
@@ -75,7 +75,7 @@
 
 	/* IOTRAP(3) SMI function call */
 	if (IOTRAP(3)) {
-		if (gnvs && gnvs->smif)
+		if (gnvs->smif)
 			io_trap_handler(gnvs->smif);
 		return;
 	}
diff --git a/src/southbridge/intel/bd82x6x/smihandler.c b/src/southbridge/intel/bd82x6x/smihandler.c
index 1a9e5b4..2f174da 100644
--- a/src/southbridge/intel/bd82x6x/smihandler.c
+++ b/src/southbridge/intel/bd82x6x/smihandler.c
@@ -144,7 +144,7 @@
 
 	/* IOTRAP(3) SMI function call */
 	if (IOTRAP(3)) {
-		if (gnvs && gnvs->smif)
+		if (gnvs->smif)
 			io_trap_handler(gnvs->smif); // call function smif
 		return;
 	}
diff --git a/src/southbridge/intel/i82801gx/smihandler.c b/src/southbridge/intel/i82801gx/smihandler.c
index 03480a7..ab6b9d0 100644
--- a/src/southbridge/intel/i82801gx/smihandler.c
+++ b/src/southbridge/intel/i82801gx/smihandler.c
@@ -55,7 +55,7 @@
 
 	/* IOTRAP(3) SMI function call */
 	if (IOTRAP(3)) {
-		if (gnvs && gnvs->smif)
+		if (gnvs->smif)
 			io_trap_handler(gnvs->smif); // call function smif
 		return;
 	}
diff --git a/src/southbridge/intel/i82801ix/smihandler.c b/src/southbridge/intel/i82801ix/smihandler.c
index 046cc2b..8260f0a 100644
--- a/src/southbridge/intel/i82801ix/smihandler.c
+++ b/src/southbridge/intel/i82801ix/smihandler.c
@@ -9,11 +9,6 @@
 
 #include "nvs.h"
 
-#if !CONFIG(SMM_TSEG)
-/* For qemu/x86-q35 to build properly. */
-struct global_nvs *gnvs;
-#endif
-
 int southbridge_io_trap_handler(int smif)
 {
 	switch (smif) {
@@ -49,7 +44,7 @@
 
 	/* IOTRAP(3) SMI function call */
 	if (IOTRAP(3)) {
-		if (gnvs && gnvs->smif)
+		if (CONFIG(SMM_TSEG) && gnvs->smif)
 			io_trap_handler(gnvs->smif); // call function smif
 		return;
 	}
diff --git a/src/southbridge/intel/i82801jx/smihandler.c b/src/southbridge/intel/i82801jx/smihandler.c
index 6a6c5b4..7269b5c 100644
--- a/src/southbridge/intel/i82801jx/smihandler.c
+++ b/src/southbridge/intel/i82801jx/smihandler.c
@@ -49,7 +49,7 @@
 
 	/* IOTRAP(3) SMI function call */
 	if (IOTRAP(3)) {
-		if (gnvs && gnvs->smif)
+		if (gnvs->smif)
 			io_trap_handler(gnvs->smif); // call function smif
 		return;
 	}
diff --git a/src/southbridge/intel/ibexpeak/smihandler.c b/src/southbridge/intel/ibexpeak/smihandler.c
index e83a9de..337341f 100644
--- a/src/southbridge/intel/ibexpeak/smihandler.c
+++ b/src/southbridge/intel/ibexpeak/smihandler.c
@@ -109,7 +109,7 @@
 
 	/* IOTRAP(3) SMI function call */
 	if (IOTRAP(3)) {
-		if (gnvs && gnvs->smif)
+		if (gnvs->smif)
 			io_trap_handler(gnvs->smif); // call function smif
 		return;
 	}
diff --git a/src/southbridge/intel/lynxpoint/smihandler.c b/src/southbridge/intel/lynxpoint/smihandler.c
index bd44500..410fde1 100644
--- a/src/southbridge/intel/lynxpoint/smihandler.c
+++ b/src/southbridge/intel/lynxpoint/smihandler.c
@@ -417,7 +417,7 @@
 
 	/* IOTRAP(3) SMI function call */
 	if (IOTRAP(3)) {
-		if (gnvs && gnvs->smif)
+		if (gnvs->smif)
 			io_trap_handler(gnvs->smif); // call function smif
 		return;
 	}

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