[coreboot-gerrit] New patch to review for coreboot: 7b7a74b AGESA fam15: Unify agesawrapper

[Kyösti Mälkki (kyosti.malkki@gmail.com)]

Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7822

-gerrit

commit 7b7a74b239839afe49781bf86c61ffeeb82ad19b
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Sun Dec 14 19:30:51 2014 +0200

    AGESA fam15: Unify agesawrapper
    
    Disable TSC output for now.
    
    Change-Id: I078b4f0170aaf0ada58e464cf609c234204f8196
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 src/cpu/amd/agesa/family15/fixme.c                | 15 +++++++++++++++
 src/northbridge/amd/agesa/family15/agesawrapper.c | 15 ---------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/cpu/amd/agesa/family15/fixme.c b/src/cpu/amd/agesa/family15/fixme.c
index 666ebaf..39a652e 100644
--- a/src/cpu/amd/agesa/family15/fixme.c
+++ b/src/cpu/amd/agesa/family15/fixme.c
@@ -279,3 +279,18 @@ void amd_initmmio(void)
 	MsrReg = ((1ULL << CONFIG_CPU_ADDR_BITS) - CACHE_ROM_SIZE) | 0x800ull;
 	LibAmdMsrWrite(0x20D, &MsrReg, &StdHeader);
 }
+
+#if 0
+#include <cpuFamilyTranslation.h>
+
+void cpu_show_tsc(void)
+{
+	UINT32 TscRateInMhz;
+	CPU_SPECIFIC_SERVICES *FamilySpecificServices;
+
+	GetCpuServicesOfCurrentCore((CONST CPU_SPECIFIC_SERVICES **) & FamilySpecificServices,
+				    &AmdParamStruct.StdHeader);
+	FamilySpecificServices->GetTscRate(FamilySpecificServices, &TscRateInMhz, &AmdParamStruct.StdHeader);
+	printk(BIOS_DEBUG, "BSP Frequency: %uMHz\n", (unsigned int)TscRateInMhz);
+}
+#endif
diff --git a/src/northbridge/amd/agesa/family15/agesawrapper.c b/src/northbridge/amd/agesa/family15/agesawrapper.c
index 44fd448..9b62d3f 100644
--- a/src/northbridge/amd/agesa/family15/agesawrapper.c
+++ b/src/northbridge/amd/agesa/family15/agesawrapper.c
@@ -32,7 +32,6 @@
 #include "amdlib.h"
 #include "Filecode.h"
 #include "heapManager.h"
-#include <cpuFamilyTranslation.h>	/* CPU_SPECIFIC_SERVICES */
 
 #define FILECODE UNASSIGNED_FILE_FILECODE
 
@@ -87,8 +86,6 @@ AGESA_STATUS agesawrapper_amdinitearly(void)
 	AGESA_STATUS status;
 	AMD_INTERFACE_PARAMS AmdParamStruct;
 	AMD_EARLY_PARAMS *AmdEarlyParamsPtr;
-	UINT32 TscRateInMhz;
-	CPU_SPECIFIC_SERVICES *FamilySpecificServices;
 
 	memset(&AmdParamStruct, 0, sizeof(AMD_INTERFACE_PARAMS));
 
@@ -109,11 +106,6 @@ AGESA_STATUS agesawrapper_amdinitearly(void)
 	status = AmdInitEarly(AmdEarlyParamsPtr);
 	AGESA_EVENTLOG(status, &AmdParamStruct.StdHeader);
 
-	GetCpuServicesOfCurrentCore((CONST CPU_SPECIFIC_SERVICES **) & FamilySpecificServices,
-				    &AmdParamStruct.StdHeader);
-	FamilySpecificServices->GetTscRate(FamilySpecificServices, &TscRateInMhz, &AmdParamStruct.StdHeader);
-	printk(BIOS_DEBUG, "BSP Frequency: %uMHz\n", (unsigned int)TscRateInMhz);
-
 	AmdReleaseStruct(&AmdParamStruct);
 	return status;
 }
@@ -123,8 +115,6 @@ AGESA_STATUS agesawrapper_amdinitpost(void)
 	AGESA_STATUS status;
 	AMD_INTERFACE_PARAMS AmdParamStruct;
 	AMD_POST_PARAMS *PostParams;
-	UINT32 TscRateInMhz;
-	CPU_SPECIFIC_SERVICES *FamilySpecificServices;
 
 	memset(&AmdParamStruct, 0, sizeof(AMD_INTERFACE_PARAMS));
 
@@ -150,11 +140,6 @@ AGESA_STATUS agesawrapper_amdinitpost(void)
 	/* Initialize heap space */
 	EmptyHeap();
 
-	GetCpuServicesOfCurrentCore((CONST CPU_SPECIFIC_SERVICES **) & FamilySpecificServices,
-				    &AmdParamStruct.StdHeader);
-	FamilySpecificServices->GetTscRate(FamilySpecificServices, &TscRateInMhz, &AmdParamStruct.StdHeader);
-	printk(BIOS_DEBUG, "BSP Frequency: %uMHz\n", (unsigned int)TscRateInMhz);
-
 	return status;
 }