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

View Change

[WIP] sb/intel/i82801ix,jx: Adjust TCO watchdog timeout

Change-Id: I1514fc8ada9198fae40dce985eb6c5de86a00f51
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
---
M src/southbridge/intel/i82801ix/i82801ix.c
M src/southbridge/intel/i82801jx/i82801jx.c
2 files changed, 6 insertions(+), 6 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/70/41970/1

diff --git a/src/southbridge/intel/i82801ix/i82801ix.c b/src/southbridge/intel/i82801ix/i82801ix.c
index b2b55ce..5e5e667 100644
--- a/src/southbridge/intel/i82801ix/i82801ix.c
+++ b/src/southbridge/intel/i82801ix/i82801ix.c
@@ -204,9 +204,9 @@
 	i82801ix_hide_functions();
 
 	/* Reset watchdog timer. */
-#if !CONFIG(HAVE_SMI_HANDLER)
-	outw(0x0008, DEFAULT_TCOBASE + 0x12); /* Set higher timer value. */
-#endif
+	if (!permanent_smi_handler())
+		outw(0x0008, DEFAULT_TCOBASE + 0x12); /* Set higher timer value. */
+
 	outw(0x0000, DEFAULT_TCOBASE + 0x00); /* Update timer. */
 }
 
diff --git a/src/southbridge/intel/i82801jx/i82801jx.c b/src/southbridge/intel/i82801jx/i82801jx.c
index b4ffcfa..7c6371b 100644
--- a/src/southbridge/intel/i82801jx/i82801jx.c
+++ b/src/southbridge/intel/i82801jx/i82801jx.c
@@ -203,9 +203,9 @@
 	i82801jx_hide_functions();
 
 	/* Reset watchdog timer. */
-#if !CONFIG(HAVE_SMI_HANDLER)
-	outw(0x0008, DEFAULT_TCOBASE + 0x12); /* Set higher timer value. */
-#endif
+	if (!permanent_smi_handler())
+		outw(0x0008, DEFAULT_TCOBASE + 0x12); /* Set higher timer value. */
+
 	outw(0x0000, DEFAULT_TCOBASE + 0x00); /* Update timer. */
 }
 

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