From d2fa33733325eb4ec4a3a5d8a658602a01cbf8d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Sun, 24 Sep 2017 22:03:55 +0300 Subject: [PATCH] amd/stoneyridge: Drop FieldAcccessors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It was either SAGE or AMD AES who implemented these for binaryPI, and it is not part of the documented AGESA API. My conclusions of these are: AmdGetValue() returns values from build-time configuration, these may not reflect the actual run-time configuration as there are OEM customization hooks to implement overrides. AmdSetValue() in __PRE_RAM__ will fail, as configuration data is const. Also AmdSetValue() in ramstage may fail, if said configuration data has already been evaluated. Semamtics of these calls are unusable unless one also has access to PI source to make exact decision on when they can be called. Remove these now that stoneyridge does not actually require them. Change-Id: I3379a75ce3b9448c17ef00eb16d3193c296626cd Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/21666 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/vendorcode/amd/pi/00670F00/AMD.h | 4 +- .../amd/pi/00670F00/binaryPI/AGESA.c | 73 ----------- .../amd/pi/00670F00/binaryPI/FieldAccessors.h | 118 ------------------ 3 files changed, 2 insertions(+), 193 deletions(-) delete mode 100644 src/vendorcode/amd/pi/00670F00/binaryPI/FieldAccessors.h diff --git a/src/vendorcode/amd/pi/00670F00/AMD.h b/src/vendorcode/amd/pi/00670F00/AMD.h index 003ac0e19a..731b9c189c 100644 --- a/src/vendorcode/amd/pi/00670F00/AMD.h +++ b/src/vendorcode/amd/pi/00670F00/AMD.h @@ -157,8 +157,8 @@ typedef enum { FCH_INIT_LATE = 0x00043000, FCH_INIT_S3_EARLY_RESTORE = 0x00044000, FCH_INIT_S3_LATE_RESTORE = 0x00045000, - AMD_SET_VALUE = 0x00081000, - AMD_GET_VALUE = 0x00082000 + AMD_SET_VALUE_invalid = 0x00081000, + AMD_GET_VALUE_invalid = 0x00082000 } AGESA_STRUCT_NAME; /* ResetType constant values */ diff --git a/src/vendorcode/amd/pi/00670F00/binaryPI/AGESA.c b/src/vendorcode/amd/pi/00670F00/binaryPI/AGESA.c index 405a45075d..046dcb4b5d 100644 --- a/src/vendorcode/amd/pi/00670F00/binaryPI/AGESA.c +++ b/src/vendorcode/amd/pi/00670F00/binaryPI/AGESA.c @@ -42,7 +42,6 @@ // TODO This list needs to be pruned of anything that is not API #include "AGESA.h" #include "agesawrapper.h" -#include "FieldAccessors.h" #include "AcpiLib.h" #include "FchCommonCfg.h" #include "Fch.h" @@ -461,75 +460,3 @@ HeapDeallocateBuffer ( return Dispatcher(&InterfaceParams); } - -/********************************************************************** - * Interface call: AmdSetValue - **********************************************************************/ -AGESA_STATUS -AmdSetValue ( - IN CONST AGESA_FIELD_NAME name, - IN OUT VOID* value, - IN UINT32 size - ) -{ - AGESA_STATUS status = AGESA_UNSUPPORTED; - - MODULE_ENTRY Dispatcher = NULL; - const AMD_MODULE_HEADER* module = agesawrapper_locate_module(ModuleIdentifier); - - AMD_ACCESSOR_PARAMS AccessorParams = {}; - - if (!module) return status; - Dispatcher = module->ModuleDispatcher; - - AccessorParams.StdHeader.AltImageBasePtr = 0; - AccessorParams.StdHeader.CalloutPtr = NULL; - AccessorParams.StdHeader.Func = AMD_SET_VALUE; - AccessorParams.StdHeader.ImageBasePtr = 0; - - AccessorParams.AllocationMethod = ByHost; - AccessorParams.FieldName = name; - AccessorParams.FieldValue = value; - AccessorParams.FieldSize = size; - - status = Dispatcher(&AccessorParams); - return status; -} - -/********************************************************************** - * Interface call: AmdGetValue - **********************************************************************/ -AGESA_STATUS -AmdGetValue ( - IN CONST AGESA_FIELD_NAME name, - IN OUT VOID** value, - IN UINT32 size - ) -{ - AGESA_STATUS status = AGESA_UNSUPPORTED; - - MODULE_ENTRY Dispatcher = NULL; - const AMD_MODULE_HEADER* module = agesawrapper_locate_module(ModuleIdentifier); - - AMD_ACCESSOR_PARAMS AccessorParams = {}; - - if (!module) return status; - Dispatcher = module->ModuleDispatcher; - - AccessorParams.StdHeader.AltImageBasePtr = 0; - AccessorParams.StdHeader.CalloutPtr = NULL; - AccessorParams.StdHeader.Func = AMD_GET_VALUE; - AccessorParams.StdHeader.ImageBasePtr = 0; - - AccessorParams.AllocationMethod = ByHost; - AccessorParams.FieldName = name; - AccessorParams.FieldValue = *value; - AccessorParams.FieldSize = size; - - status = Dispatcher(&AccessorParams); - - *value = AccessorParams.FieldValue; - size = AccessorParams.FieldSize; - - return status; -} diff --git a/src/vendorcode/amd/pi/00670F00/binaryPI/FieldAccessors.h b/src/vendorcode/amd/pi/00670F00/binaryPI/FieldAccessors.h deleted file mode 100644 index 2d860c5005..0000000000 --- a/src/vendorcode/amd/pi/00670F00/binaryPI/FieldAccessors.h +++ /dev/null @@ -1,118 +0,0 @@ -/***************************************************************************** - * - * Copyright (c) 2013 - 2014, Sage Electronic Engineering, LLC - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of Advanced Micro Devices, Inc. nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL ADVANCED MICRO DEVICES, INC. BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - ***************************************************************************/ -#ifndef _FIELDACCESSORS_H_ -#define _FIELDACCESSORS_H_ - -/// AGESA value name -typedef enum { - AMD_GLOBAL_USER_OPTIONS = 0x00020000, - AMD_GLOBAL_NUM_SOCKETS = 0x00020001, - AMD_GLOBAL_NUM_MODULES = 0x00020002, -} AGESA_FIELD_NAME; - -typedef AGESA_STATUS (*SETTER_ENTRY) ( - IN OUT VOID* value, - IN UINT32 size - ); - -typedef AGESA_STATUS (*GETTER_ENTRY) ( - IN OUT VOID** value, - IN UINT32 size - ); - -/// Accessor Interface. -typedef struct { - IN AMD_CONFIG_PARAMS StdHeader; ///< Standard configuration header - IN AGESA_FIELD_NAME FieldName; ///< The service to init - IN ALLOCATION_METHOD AllocationMethod; ///< For pointers, how to allocate space for copied data - IN OUT VOID *Struct; ///< The struct for the service. - IN OUT UINT32 FieldSize; ///< The size of the data value. - IN OUT VOID *FieldValue; ///< The value retrieved or set into the target structure. -} AMD_ACCESSOR_PARAMS; - -/********************************************************************** - * Interface call: AmdSetValue - **********************************************************************/ -AGESA_STATUS -AmdSetValueDispatch ( - IN OUT AMD_ACCESSOR_PARAMS *AccessorParams - ); - -AGESA_STATUS -AmdSetValue ( - IN CONST AGESA_FIELD_NAME name, - IN OUT VOID* value, - IN UINT32 size - ); - -/********************************************************************** - * Interface call: AmdGetValue - **********************************************************************/ -AGESA_STATUS -AmdGetValueDispatch ( - IN OUT AMD_ACCESSOR_PARAMS *AccessorParams - ); - -AGESA_STATUS -AmdGetValue ( - IN CONST AGESA_FIELD_NAME name, - IN OUT VOID** value, - IN UINT32 size - ); - -/** - * Dispatch Table. - * - * The push high dispatcher uses this table to find what entries are currently in the build image. - */ -typedef struct { - UINT32 FunctionId; - SETTER_ENTRY SetValueEntryPoint; - GETTER_ENTRY GetValueEntryPoint; -} ACCESSOR_DISPATCH_TABLE; - -AGESA_STATUS -GetUserOptions( - IN OUT VOID** value, - IN UINT32 size - ); - -AGESA_STATUS -GetNumSockets( - IN OUT VOID** value, - IN UINT32 size - ); - -AGESA_STATUS -GetNumModules( - IN OUT VOID** value, - IN UINT32 size - ); - -#endif /* _FIELDACCESSORS_H_ */