From 879eb711f518b0bf4651037cb1b31d7d18567513 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Sat, 25 Mar 2017 22:45:18 +0200 Subject: [PATCH] UPSTREAM: AGESA: Move EmptyHeap() call Specification says to do CAR teardown as part of AmdInitPost(). Move initializing the final AGESA heap storage to AmdInitEnv() so the buffer is not invalidated without writeback. BUG=none BRANCH=none TEST=none Change-Id: Ib17675c8cddb8b1266f389b6a2c505713897da64 Signed-off-by: Patrick Georgi Original-Commit-Id: 4a6e00fd365bee06e2860f813c0fc05c5f4c22b9 Original-Change-Id: I3a5d497d0e25ec291f722e9f089bc8928238c3f9 Original-Signed-off-by: Kysti Mlkki Original-Reviewed-on: https://review.coreboot.org/19024 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Martin Roth Reviewed-on: https://chromium-review.googlesource.com/466059 --- src/northbridge/amd/agesa/agesawrapper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/northbridge/amd/agesa/agesawrapper.c b/src/northbridge/amd/agesa/agesawrapper.c index 0a6f2a3370..d21c9c371a 100644 --- a/src/northbridge/amd/agesa/agesawrapper.c +++ b/src/northbridge/amd/agesa/agesawrapper.c @@ -111,9 +111,6 @@ AGESA_STATUS agesawrapper_amdinitpost(void) AmdReleaseStruct(&AmdParamStruct); - /* Initialize heap space */ - EmptyHeap(); - return status; } @@ -153,6 +150,9 @@ AGESA_STATUS agesawrapper_amdinitenv(void) AMD_INTERFACE_PARAMS AmdParamStruct; AMD_ENV_PARAMS *EnvParam; + /* Initialize heap space */ + EmptyHeap(); + memset(&AmdParamStruct, 0, sizeof(AMD_INTERFACE_PARAMS)); AmdParamStruct.AgesaFunctionName = AMD_INIT_ENV;