From f50fbe82ad0837ae7b30d7e2a5570ffc0dcc3950 Mon Sep 17 00:00:00 2001 From: Aladyshev Konstantin Date: Wed, 19 Dec 2012 09:31:01 +0400 Subject: [PATCH] AGESA: Use `Flag=AGESA_SUCCESS` instead of `TRUE` in DMI related functions Success return value in DMI functions GetDmiInfoMain(..) and GetType4Type7Info(...) of AGESA vendorcode is "Flag = TRUE". This results in a failure of init late function: "agesawrapper_amdinitlate failed: 1" It happens because TRUE = 1 = AGESA_UNSUPPORTED. Replacing TRUE with AGESA_SUCCESS (= 0) fixes this problem. Only family f15tn does not have such bug. This patch just replaces TRUE with AGESA_SUCCESS, but maybe all DMI functions should be copied from Trinity family? Tested on Supermicro H8QGI board with 4 AMD Opteron 6234 processors (f15). Change-Id: I51bf91333c088a825b92d4a44d1ebe4380c8026c Signed-off-by: Aladyshev Konstantin Signed-off-by: Paul Menzel Reviewed-on: http://review.coreboot.org/2070 Reviewed-by: Marc Jones Tested-by: build bot (Jenkins) --- src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuDmi.c | 4 ++-- src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuDmi.c | 4 ++-- src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuDmi.c | 4 ++-- src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuDmi.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuDmi.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuDmi.c index 9e7ea86ec0..249677932b 100644 --- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuDmi.c +++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuDmi.c @@ -206,7 +206,7 @@ GetDmiInfoMain ( LOCATE_HEAP_PTR LocateHeapParams; MsrData = 0; - Flag = TRUE; + Flag = AGESA_SUCCESS; DmiBufferPtr = *DmiTable; if (DmiBufferPtr == NULL) { // @@ -387,7 +387,7 @@ GetType4Type7Info ( PROC_FAMILY_TABLE *ProcData; CPU_LOGICAL_ID LogicalID; - Flag = TRUE; + Flag = AGESA_SUCCESS; DmiBufferPtr = (DMI_INFO *) ApExeParams->RelatedDataBlock; GetLogicalIdOfCurrentCore (&LogicalID, &ApExeParams->StdHeader); diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuDmi.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuDmi.c index 60095d00df..999ccf5553 100644 --- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuDmi.c +++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuDmi.c @@ -216,7 +216,7 @@ GetDmiInfoMain ( CPU_GET_MEM_INFO CpuGetMemInfo; MsrData = 0; - Flag = TRUE; + Flag = AGESA_SUCCESS; ProcData = NULL; MemInfo = NULL; DmiBufferPtr = *DmiTable; @@ -415,7 +415,7 @@ GetType4Type7Info ( PROC_FAMILY_TABLE *ProcData; CPU_LOGICAL_ID LogicalID; - Flag = TRUE; + Flag = AGESA_SUCCESS; DmiBufferPtr = (DMI_INFO *) ApExeParams->RelatedDataBlock; GetLogicalIdOfCurrentCore (&LogicalID, &ApExeParams->StdHeader); diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuDmi.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuDmi.c index 0bf357d87a..b8167327fa 100644 --- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuDmi.c +++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuDmi.c @@ -220,7 +220,7 @@ GetDmiInfoMain ( CPU_GET_MEM_INFO CpuGetMemInfo; MsrData = 0; - Flag = TRUE; + Flag = AGESA_SUCCESS; ProcData = NULL; MemInfo = NULL; DmiBufferPtr = *DmiTable; @@ -429,7 +429,7 @@ GetType4Type7Info ( PROC_FAMILY_TABLE *ProcData; CPU_LOGICAL_ID LogicalID; - Flag = TRUE; + Flag = AGESA_SUCCESS; DmiBufferPtr = (DMI_INFO *) ApExeParams->RelatedDataBlock; GetLogicalIdOfCurrentCore (&LogicalID, &ApExeParams->StdHeader); diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuDmi.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuDmi.c index 5619df3797..2385752e88 100644 --- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuDmi.c +++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuDmi.c @@ -219,7 +219,7 @@ GetDmiInfoMain ( CPU_GET_MEM_INFO CpuGetMemInfo; MsrData = 0; - Flag = TRUE; + Flag = AGESA_SUCCESS; ProcData = NULL; MemInfo = NULL; DmiBufferPtr = *DmiTable; @@ -439,7 +439,7 @@ GetType4Type7Info ( CPU_LOGICAL_ID LogicalID; UINT8 L3Associativity; - Flag = TRUE; + Flag = AGESA_SUCCESS; DmiBufferPtr = (DMI_INFO *) ApExeParams->RelatedDataBlock; GetLogicalIdOfCurrentCore (&LogicalID, &ApExeParams->StdHeader);