UPSTREAM: AGESA boards: Fix split to romstage and ramstage

Boards broken with commit:
062ef1c AGESA boards: Split dispatcher to romstage and ramstage

Boot failure with asus/f2a85-m witnessed around MemMS3Save() call,
message "Save memory S3 data in heap" in verbose agesa logs was
replaced by a system reset.

Default stubs for MemS3ResumeConstructNBBlock() returned TRUE
without initializing the block contents. This would not work for case
with multiple NB support built into same firmware.

MemMCreateS3NbBlock() then returned with S3NBPtr!=NULL with uninitialized
data and MemMContextSave() referenced those as invalid pointers.

There is no reason to prevent booting in the case S3 resume data is not
passed to ramstage, so remove the ASSERT(). It only affects builds with
IDSOPT_IDS_ENABLED=TRUE anyways.

BUG=None
BRANCH=None
TEST=None

Change-Id: I8fd1e308ceab2b6f4b4c90f0f712934c2918d92d
Original-Signed-off-by: Kysti Mlkki <kyosti.malkki@gmail.com>
Original-Reviewed-on: https://review.coreboot.org/15344
Original-Tested-by: build bot (Jenkins)
Original-Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Original-Reviewed-by: Idwer Vollering <vidwer@gmail.com>
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/358388
Reviewed-by: Martin Roth <martinroth@chromium.org>
This commit is contained in:
Kyösti Mälkki 2016-06-24 16:37:05 +03:00 committed by chrome-bot
parent 9d339b492f
commit e3d8bc3c10
4 changed files with 2 additions and 4 deletions

View file

@ -124,7 +124,7 @@ BOOLEAN MemFS3DefConstructorRet (
IN UINT8 NodeID
)
{
return TRUE;
return FALSE;
}
#if (OPTION_MEMCTLR_DR == TRUE)

View file

@ -319,7 +319,6 @@ MemMS3Save (
if (RefPtr->MemContext.NvStorage == NULL) {
// Memory context cannot be saved succesfully
ASSERT (FALSE);
return FALSE;
}
}

View file

@ -124,7 +124,7 @@ BOOLEAN MemFS3DefConstructorRet (
IN UINT8 NodeID
)
{
return TRUE;
return FALSE;
}
#if (OPTION_MEMCTLR_TN == TRUE)

View file

@ -576,7 +576,6 @@ MemMS3Save (
if (RefPtr->MemContext.NvStorage == NULL) {
// Memory context cannot be saved succesfully
ASSERT (FALSE);
return FALSE;
}
}