[coreboot-gerrit] New patch to review for coreboot: 2dcf94a AGESA wrapper: Do not assert if return value not bigger than AGESA_BOUNDS_CHK

Zheng Bao (zheng.bao@amd.com) gerrit at coreboot.org
Thu Nov 7 11:19:34 CET 2013


Zheng Bao (zheng.bao at amd.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4031

-gerrit

commit 2dcf94a9b2a8453096bf6bed388d677319a1b90a
Author: Zheng Bao <fishbaozi at gmail.com>
Date:   Thu Nov 7 17:55:04 2013 +0800

    AGESA wrapper: Do not assert if return value not bigger than AGESA_BOUNDS_CHK
    
    AGESA_BOUNDS_CHK means the requested service is not available in heap.
    Reading log will get the message like:
    -------------------------
    EventLog:  EventClass = 2, EventInfo = 8040100.
      Param1 = 1080000, Param2 = 0.
      Param3 = 0, Param4 = 0.
    -------------------------
    It doesn't hurt the main stream of code flow. So we set the limit for assertion
    higher.
    
    sed 's/ASSERT(Status == AGESA_SUCCESS)/ASSERT(Status <= AGESA_BOUNDS_CHK)/g'
    
    Change-Id: I5db609081342b2d1a81ec3e35ebc83d527e6f387
    Signed-off-by: Zheng Bao <zheng.bao at amd.com>
    Signed-off-by: Zheng Bao <fishbaozi at gmail.com>
---
 src/mainboard/amd/dinar/agesawrapper.c              | 4 ++--
 src/mainboard/amd/inagua/agesawrapper.c             | 4 ++--
 src/mainboard/amd/olivehill/agesawrapper.c          | 8 ++++----
 src/mainboard/amd/parmer/agesawrapper.c             | 8 ++++----
 src/mainboard/amd/persimmon/agesawrapper.c          | 8 ++++----
 src/mainboard/amd/south_station/agesawrapper.c      | 4 ++--
 src/mainboard/amd/thatcher/agesawrapper.c           | 8 ++++----
 src/mainboard/amd/torpedo/agesawrapper.c            | 4 ++--
 src/mainboard/amd/union_station/agesawrapper.c      | 4 ++--
 src/mainboard/asrock/e350m1/agesawrapper.c          | 4 ++--
 src/mainboard/asrock/imb-a180/agesawrapper.c        | 8 ++++----
 src/mainboard/asus/f2a85-m/agesawrapper.c           | 8 ++++----
 src/mainboard/lippert/frontrunner-af/agesawrapper.c | 8 ++++----
 src/mainboard/lippert/toucan-af/agesawrapper.c      | 8 ++++----
 src/mainboard/supermicro/h8qgi/agesawrapper.c       | 2 +-
 src/mainboard/supermicro/h8scm/agesawrapper.c       | 2 +-
 src/mainboard/tyan/s8226/agesawrapper.c             | 2 +-
 17 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/src/mainboard/amd/dinar/agesawrapper.c b/src/mainboard/amd/dinar/agesawrapper.c
index 179822b..30e9977 100644
--- a/src/mainboard/amd/dinar/agesawrapper.c
+++ b/src/mainboard/amd/dinar/agesawrapper.c
@@ -549,7 +549,7 @@ agesawrapper_amdinitlate(VOID)
 	if (Status != AGESA_SUCCESS) {
 		//agesawrapper_amdreadeventlog(AmdLateParamsPtr->StdHeader.HeapStatus);
 		agesawrapper_amdreadeventlog();
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 	DmiTable    = AmdLateParamsPtr->DmiTable;
 	AcpiPstate  = AmdLateParamsPtr->AcpiPState;
@@ -594,7 +594,7 @@ agesawrapper_amdlaterunaptask (
 	Status = AmdLateRunApTask (&AmdLateParams);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog();
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	return (UINT32)Status;
diff --git a/src/mainboard/amd/inagua/agesawrapper.c b/src/mainboard/amd/inagua/agesawrapper.c
index e7a47c0..768bd78 100644
--- a/src/mainboard/amd/inagua/agesawrapper.c
+++ b/src/mainboard/amd/inagua/agesawrapper.c
@@ -472,7 +472,7 @@ agesawrapper_amdinitlate (
 	Status = AmdInitLate (AmdLateParamsPtr);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog();
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	DmiTable    = AmdLateParamsPtr->DmiTable;
@@ -521,7 +521,7 @@ agesawrapper_amdlaterunaptask (
 	Status = AmdLateRunApTask (&ApExeParams);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog();
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	return (UINT32)Status;
diff --git a/src/mainboard/amd/olivehill/agesawrapper.c b/src/mainboard/amd/olivehill/agesawrapper.c
index 06405ad..c74f289 100644
--- a/src/mainboard/amd/olivehill/agesawrapper.c
+++ b/src/mainboard/amd/olivehill/agesawrapper.c
@@ -428,7 +428,7 @@ agesawrapper_amdinitlate (
 	/* CDIT table is not created. */
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog(AmdLateParams->StdHeader.HeapStatus);
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	DmiTable    = AmdLateParams->DmiTable;
@@ -477,7 +477,7 @@ agesawrapper_amdlaterunaptask (
 	Status = AmdLateRunApTask (&ApExeParams);
 	if (Status != AGESA_SUCCESS) {
 		/* agesawrapper_amdreadeventlog(); */
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	return (UINT32)Status;
@@ -632,7 +632,7 @@ UINT32 agesawrapper_amds3laterestore (VOID)
 	Status = AmdS3LateRestore (AmdS3LateParamsPtr);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog(AmdInterfaceParams.StdHeader.HeapStatus);
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	return (UINT32)Status;
@@ -706,7 +706,7 @@ UINT32 agesawrapper_amdS3Save(VOID)
 	Status = AmdS3Save(AmdS3SaveParamsPtr);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog(AmdInterfaceParams.StdHeader.HeapStatus);
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	S3DataType = S3DataTypeNonVolatile;
diff --git a/src/mainboard/amd/parmer/agesawrapper.c b/src/mainboard/amd/parmer/agesawrapper.c
index c160106..5e4e64b 100644
--- a/src/mainboard/amd/parmer/agesawrapper.c
+++ b/src/mainboard/amd/parmer/agesawrapper.c
@@ -428,7 +428,7 @@ agesawrapper_amdinitlate (
 	/* CDIT table is not created. */
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog(AmdLateParams->StdHeader.HeapStatus);
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	DmiTable    = AmdLateParams->DmiTable;
@@ -477,7 +477,7 @@ agesawrapper_amdlaterunaptask (
 	Status = AmdLateRunApTask (&ApExeParams);
 	if (Status != AGESA_SUCCESS) {
 		/* agesawrapper_amdreadeventlog(); */
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	return (UINT32)Status;
@@ -632,7 +632,7 @@ UINT32 agesawrapper_amds3laterestore (VOID)
 	Status = AmdS3LateRestore (AmdS3LateParamsPtr);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog(AmdInterfaceParams.StdHeader.HeapStatus);
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	return (UINT32)Status;
@@ -706,7 +706,7 @@ UINT32 agesawrapper_amdS3Save(VOID)
 	Status = AmdS3Save(AmdS3SaveParamsPtr);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog(AmdInterfaceParams.StdHeader.HeapStatus);
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	S3DataType = S3DataTypeNonVolatile;
diff --git a/src/mainboard/amd/persimmon/agesawrapper.c b/src/mainboard/amd/persimmon/agesawrapper.c
index 0572335..bb3448a 100644
--- a/src/mainboard/amd/persimmon/agesawrapper.c
+++ b/src/mainboard/amd/persimmon/agesawrapper.c
@@ -493,7 +493,7 @@ agesawrapper_amdinitlate (
 	Status = AmdInitLate (AmdLateParamsPtr);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog();
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	DmiTable    = AmdLateParamsPtr->DmiTable;
@@ -594,7 +594,7 @@ agesawrapper_amds3laterestore (
 	Status = AmdS3LateRestore (AmdS3LateParamsPtr);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog();
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	return (UINT32)Status;
@@ -631,7 +631,7 @@ agesawrapper_amdS3Save (
 	Status = AmdS3Save (AmdS3SaveParamsPtr);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog();
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	S3DataType = S3DataTypeNonVolatile;
@@ -684,7 +684,7 @@ agesawrapper_amdlaterunaptask (
 	Status = AmdLateRunApTask (&ApExeParams);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog();
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	return (UINT32)Status;
diff --git a/src/mainboard/amd/south_station/agesawrapper.c b/src/mainboard/amd/south_station/agesawrapper.c
index 635b632..b316107 100644
--- a/src/mainboard/amd/south_station/agesawrapper.c
+++ b/src/mainboard/amd/south_station/agesawrapper.c
@@ -472,7 +472,7 @@ agesawrapper_amdinitlate (
 	Status = AmdInitLate (AmdLateParamsPtr);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog();
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	DmiTable    = AmdLateParamsPtr->DmiTable;
@@ -516,7 +516,7 @@ agesawrapper_amdlaterunaptask (
 	Status = AmdLateRunApTask (&ApExeParams);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog();
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	return (UINT32)Status;
diff --git a/src/mainboard/amd/thatcher/agesawrapper.c b/src/mainboard/amd/thatcher/agesawrapper.c
index 9480bdc..4335949 100644
--- a/src/mainboard/amd/thatcher/agesawrapper.c
+++ b/src/mainboard/amd/thatcher/agesawrapper.c
@@ -426,7 +426,7 @@ agesawrapper_amdinitlate (
 	/* CDIT table is not created. */
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog(AmdLateParams->StdHeader.HeapStatus);
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	DmiTable    = AmdLateParams->DmiTable;
@@ -475,7 +475,7 @@ agesawrapper_amdlaterunaptask (
 	Status = AmdLateRunApTask (&ApExeParams);
 	if (Status != AGESA_SUCCESS) {
 		/* agesawrapper_amdreadeventlog(); */
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	return (UINT32)Status;
@@ -634,7 +634,7 @@ UINT32 agesawrapper_amds3laterestore (VOID)
 	Status = AmdS3LateRestore (AmdS3LateParamsPtr);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog(AmdInterfaceParams.StdHeader.HeapStatus);
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	return (UINT32)Status;
@@ -708,7 +708,7 @@ UINT32 agesawrapper_amdS3Save(VOID)
 	Status = AmdS3Save(AmdS3SaveParamsPtr);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog(AmdInterfaceParams.StdHeader.HeapStatus);
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	S3DataType = S3DataTypeNonVolatile;
diff --git a/src/mainboard/amd/torpedo/agesawrapper.c b/src/mainboard/amd/torpedo/agesawrapper.c
index 8d06811..4fb95bc 100644
--- a/src/mainboard/amd/torpedo/agesawrapper.c
+++ b/src/mainboard/amd/torpedo/agesawrapper.c
@@ -512,7 +512,7 @@ agesawrapper_amdinitlate (
   Status = AmdInitLate (&AmdLateParams);
   if (Status != AGESA_SUCCESS) {
     agesawrapper_amdreadeventlog();
-    ASSERT(Status == AGESA_SUCCESS);
+    ASSERT(Status <= AGESA_BOUNDS_CHK);
   }
 
   DmiTable       = AmdLateParams.DmiTable;
@@ -549,7 +549,7 @@ agesawrapper_amdlaterunaptask (
   Status = AmdLateRunApTask (&ApExeParams);
   if (Status != AGESA_SUCCESS) {
     agesawrapper_amdreadeventlog();
-    ASSERT(Status == AGESA_SUCCESS);
+    ASSERT(Status <= AGESA_BOUNDS_CHK);
   }
 
   return (UINT32)Status;
diff --git a/src/mainboard/amd/union_station/agesawrapper.c b/src/mainboard/amd/union_station/agesawrapper.c
index 635b632..b316107 100644
--- a/src/mainboard/amd/union_station/agesawrapper.c
+++ b/src/mainboard/amd/union_station/agesawrapper.c
@@ -472,7 +472,7 @@ agesawrapper_amdinitlate (
 	Status = AmdInitLate (AmdLateParamsPtr);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog();
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	DmiTable    = AmdLateParamsPtr->DmiTable;
@@ -516,7 +516,7 @@ agesawrapper_amdlaterunaptask (
 	Status = AmdLateRunApTask (&ApExeParams);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog();
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	return (UINT32)Status;
diff --git a/src/mainboard/asrock/e350m1/agesawrapper.c b/src/mainboard/asrock/e350m1/agesawrapper.c
index 151abb1..2c339ba 100644
--- a/src/mainboard/asrock/e350m1/agesawrapper.c
+++ b/src/mainboard/asrock/e350m1/agesawrapper.c
@@ -472,7 +472,7 @@ agesawrapper_amdinitlate (
 	Status = AmdInitLate (AmdLateParamsPtr);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog();
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	DmiTable    = AmdLateParamsPtr->DmiTable;
@@ -516,7 +516,7 @@ agesawrapper_amdlaterunaptask (
 	Status = AmdLateRunApTask (&ApExeParams);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog();
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	return (UINT32)Status;
diff --git a/src/mainboard/asrock/imb-a180/agesawrapper.c b/src/mainboard/asrock/imb-a180/agesawrapper.c
index 06405ad..c74f289 100644
--- a/src/mainboard/asrock/imb-a180/agesawrapper.c
+++ b/src/mainboard/asrock/imb-a180/agesawrapper.c
@@ -428,7 +428,7 @@ agesawrapper_amdinitlate (
 	/* CDIT table is not created. */
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog(AmdLateParams->StdHeader.HeapStatus);
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	DmiTable    = AmdLateParams->DmiTable;
@@ -477,7 +477,7 @@ agesawrapper_amdlaterunaptask (
 	Status = AmdLateRunApTask (&ApExeParams);
 	if (Status != AGESA_SUCCESS) {
 		/* agesawrapper_amdreadeventlog(); */
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	return (UINT32)Status;
@@ -632,7 +632,7 @@ UINT32 agesawrapper_amds3laterestore (VOID)
 	Status = AmdS3LateRestore (AmdS3LateParamsPtr);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog(AmdInterfaceParams.StdHeader.HeapStatus);
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	return (UINT32)Status;
@@ -706,7 +706,7 @@ UINT32 agesawrapper_amdS3Save(VOID)
 	Status = AmdS3Save(AmdS3SaveParamsPtr);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog(AmdInterfaceParams.StdHeader.HeapStatus);
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	S3DataType = S3DataTypeNonVolatile;
diff --git a/src/mainboard/asus/f2a85-m/agesawrapper.c b/src/mainboard/asus/f2a85-m/agesawrapper.c
index 66b8d4f..99bb592 100644
--- a/src/mainboard/asus/f2a85-m/agesawrapper.c
+++ b/src/mainboard/asus/f2a85-m/agesawrapper.c
@@ -428,7 +428,7 @@ agesawrapper_amdinitlate (
 	/* CDIT table is not created. */
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog(AmdLateParams->StdHeader.HeapStatus);
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	DmiTable    = AmdLateParams->DmiTable;
@@ -477,7 +477,7 @@ agesawrapper_amdlaterunaptask (
 	Status = AmdLateRunApTask (&ApExeParams);
 	if (Status != AGESA_SUCCESS) {
 		/* agesawrapper_amdreadeventlog(); */
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	return (UINT32)Status;
@@ -637,7 +637,7 @@ UINT32 agesawrapper_amds3laterestore (VOID)
 	Status = AmdS3LateRestore (AmdS3LateParamsPtr);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog(AmdInterfaceParams.StdHeader.HeapStatus);
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	return (UINT32)Status;
@@ -711,7 +711,7 @@ UINT32 agesawrapper_amdS3Save(VOID)
 	Status = AmdS3Save(AmdS3SaveParamsPtr);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog(AmdInterfaceParams.StdHeader.HeapStatus);
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	S3DataType = S3DataTypeNonVolatile;
diff --git a/src/mainboard/lippert/frontrunner-af/agesawrapper.c b/src/mainboard/lippert/frontrunner-af/agesawrapper.c
index 0572335..bb3448a 100644
--- a/src/mainboard/lippert/frontrunner-af/agesawrapper.c
+++ b/src/mainboard/lippert/frontrunner-af/agesawrapper.c
@@ -493,7 +493,7 @@ agesawrapper_amdinitlate (
 	Status = AmdInitLate (AmdLateParamsPtr);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog();
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	DmiTable    = AmdLateParamsPtr->DmiTable;
@@ -594,7 +594,7 @@ agesawrapper_amds3laterestore (
 	Status = AmdS3LateRestore (AmdS3LateParamsPtr);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog();
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	return (UINT32)Status;
@@ -631,7 +631,7 @@ agesawrapper_amdS3Save (
 	Status = AmdS3Save (AmdS3SaveParamsPtr);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog();
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	S3DataType = S3DataTypeNonVolatile;
@@ -684,7 +684,7 @@ agesawrapper_amdlaterunaptask (
 	Status = AmdLateRunApTask (&ApExeParams);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog();
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	return (UINT32)Status;
diff --git a/src/mainboard/lippert/toucan-af/agesawrapper.c b/src/mainboard/lippert/toucan-af/agesawrapper.c
index 0572335..bb3448a 100644
--- a/src/mainboard/lippert/toucan-af/agesawrapper.c
+++ b/src/mainboard/lippert/toucan-af/agesawrapper.c
@@ -493,7 +493,7 @@ agesawrapper_amdinitlate (
 	Status = AmdInitLate (AmdLateParamsPtr);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog();
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	DmiTable    = AmdLateParamsPtr->DmiTable;
@@ -594,7 +594,7 @@ agesawrapper_amds3laterestore (
 	Status = AmdS3LateRestore (AmdS3LateParamsPtr);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog();
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	return (UINT32)Status;
@@ -631,7 +631,7 @@ agesawrapper_amdS3Save (
 	Status = AmdS3Save (AmdS3SaveParamsPtr);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog();
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	S3DataType = S3DataTypeNonVolatile;
@@ -684,7 +684,7 @@ agesawrapper_amdlaterunaptask (
 	Status = AmdLateRunApTask (&ApExeParams);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog();
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 
 	return (UINT32)Status;
diff --git a/src/mainboard/supermicro/h8qgi/agesawrapper.c b/src/mainboard/supermicro/h8qgi/agesawrapper.c
index 3199575..790d50b 100644
--- a/src/mainboard/supermicro/h8qgi/agesawrapper.c
+++ b/src/mainboard/supermicro/h8qgi/agesawrapper.c
@@ -450,7 +450,7 @@ UINT32 agesawrapper_amdinitlate(VOID)
 	Status = AmdInitLate(AmdLateParamsPtr);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog(AmdLateParamsPtr->StdHeader.HeapStatus);
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 	DmiTable    = AmdLateParamsPtr->DmiTable;
 	AcpiPstate  = AmdLateParamsPtr->AcpiPState;
diff --git a/src/mainboard/supermicro/h8scm/agesawrapper.c b/src/mainboard/supermicro/h8scm/agesawrapper.c
index 49abe25..d09cfdf 100644
--- a/src/mainboard/supermicro/h8scm/agesawrapper.c
+++ b/src/mainboard/supermicro/h8scm/agesawrapper.c
@@ -450,7 +450,7 @@ UINT32 agesawrapper_amdinitlate(VOID)
 	Status = AmdInitLate(AmdLateParamsPtr);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog(AmdLateParamsPtr->StdHeader.HeapStatus);
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 	DmiTable    = AmdLateParamsPtr->DmiTable;
 	AcpiPstate  = AmdLateParamsPtr->AcpiPState;
diff --git a/src/mainboard/tyan/s8226/agesawrapper.c b/src/mainboard/tyan/s8226/agesawrapper.c
index 7fba1b7..838e109 100644
--- a/src/mainboard/tyan/s8226/agesawrapper.c
+++ b/src/mainboard/tyan/s8226/agesawrapper.c
@@ -460,7 +460,7 @@ UINT32 agesawrapper_amdinitlate(VOID)
 	Status = AmdInitLate(AmdLateParamsPtr);
 	if (Status != AGESA_SUCCESS) {
 		agesawrapper_amdreadeventlog(AmdLateParamsPtr->StdHeader.HeapStatus);
-		ASSERT(Status == AGESA_SUCCESS);
+		ASSERT(Status <= AGESA_BOUNDS_CHK);
 	}
 	DmiTable    = AmdLateParamsPtr->DmiTable;
 	AcpiPstate  = AmdLateParamsPtr->AcpiPState;



More information about the coreboot-gerrit mailing list