tree 4621eae322710c76106b6b6453f2eab9f4c72678
parent ef986d4da0af1cc9192ee2ced7c3defeb46df974
author Marshall Dawson <marshall.dawson@amd.corp-partner.google.com> 1589057084 -0600
committer Commit Bot <commit-bot@chromium.org> 1589527120 +0000

Revert "soc/amd/picasso: Disable MRC cache"

This reverts commit d9b7ba9838428cce5c6f0f010f9a566761441477.

> This causes vboot to throw an exception because the workbuf isn't setup
> yet. This happens because security/vboot/common.c assumes that
> when VBOOT_STARTS_IN_ROMSTAGE is set, CBMEM will be setup before any
> vboot functions are called. This is not always the case because
> fsp_fill_mrc_cache calls vboot functions before CBMEM is setup.
>
> Error:
> vboot CBFS maybe online, locating workbuf
> workbuf not-found
> ASSERTION ERROR: file 'src/security/vboot/common.c', line 52

The vboot logic had a temporary solution for locating the workbuf
and a TODO to move it into a linked region.  The logic itself was
more restrictive than it should have been.  Those two conditions
have now been corrected.

Add CACHE_MRC_SETTINGS back so that we maintain S3 and fast boot on
boards (like Mandolin) without explicitely requiring flashmap files.

BUG=b:153471714
TEST=Verify Trembyle can still boot/suspend/resume

Signed-off-by: Marshall Dawson <marshall.dawson@amd.corp-partner.google.com>
Change-Id: I67d7fb4fd647d52cfaaf830b1a92e7aaf7140824
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/coreboot/+/2192084
Commit-Queue: Martin Roth <martinroth@google.com>
Tested-by: Martin Roth <martinroth@google.com>
Reviewed-by: Martin Roth <martinroth@google.com>