From 94e796aae667bec0fdb1a6ed16b01d0174811b15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Sun, 14 Dec 2014 19:30:51 +0200 Subject: AGESA fam15: Unify agesawrapper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Disable TSC output for now. Change-Id: I078b4f0170aaf0ada58e464cf609c234204f8196 Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/7822 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan --- 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 666ebafea4..39a652e677 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 + +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 44fd448532..9b62d3fac8 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 /* 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; } -- cgit v1.2.3