From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.groups.io with SMTP id smtpd.web08.5311.1623107732364924330 for ; Mon, 07 Jun 2021 16:15:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20150623.gappssmtp.com header.s=20150623 header.b=VqRF6QBG; spf=pass (domain: nuviainc.com, ip: 209.85.221.46, mailfrom: leif@nuviainc.com) Received: by mail-wr1-f46.google.com with SMTP id r9so2708659wrz.10 for ; Mon, 07 Jun 2021 16:15:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=2RhaiS7WOmZPK+gmSUo9fDntkBsYPuORjsJ6M92pb+M=; b=VqRF6QBG6uu65W/C70Dv9Myscxb10nm0ihANjM/var9uJMviJNCg5oQH04/tc9tQMh WgslWmRYJLP+/hBLbqldNOg+5502BtS+frV+gbdt8tWyZjxRSSdiqgv3iXbngkxQw8s6 QwLhRyxty7eXGzDppzdhS4339KRHY6lQggaQxtHI3pXyXX9TU275ZYlJ7WfxuqAB1gDf nWQbA+7HCqoS01WitZC9dV+HAakMLemhc3ODqNNm4Xt6Ub+alW1+9eWjNdmQ3sJHTef2 RkrO0psr9ODSaMVOZii7SSx7zJMpIAOLlGINaQJHu7QAXkf+aF2FxACbwkUgLr7rpyiA g65g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=2RhaiS7WOmZPK+gmSUo9fDntkBsYPuORjsJ6M92pb+M=; b=cAq7UFs9lohE+nXqj7DRst0B7NBL+8FomdkRPbSvg5HqaGTAqvt/jQuTRdj6nWuWPK kX/TRgITaI7zdAm8L2fDzioHdPITfvCrvhDTyIsodJT5KAv74jty2ZvLUbMcTOX7h+WU GQCB3xl1LEGRog1h+OYcQtnBkV3YX1Py1sJP7LA1Wbvh6i2hVJ2k2bcFgmDDRwttQkKr T6epS0floxe/TplHZ8gXQApT2V0d9FNrHx2RioE5P0dZXGsr9aNSYa+sGd9lCIzW3RRq aCj3eIfVmjMaQu2g4YGuqPZkgXcjVgZPI+h/+1NViL9sHCIZX74yngskLvDg3Do4V6UD 17tg== X-Gm-Message-State: AOAM531eq2FhVKd+GBz/2WJN2eWq3zYmO+T8UWVTMNWwqvPtLwKxjco3 fBV9X/w+kusdR1x1JBmxR/Kziw== X-Google-Smtp-Source: ABdhPJwmqAVaBo9VJ6YRBC/DxgTub/8BMU4OUXu5UkqkvlBFYfD4wb19UW7oDQvVIrMSU9qrPMehJg== X-Received: by 2002:a5d:64e8:: with SMTP id g8mr16570446wri.388.1623107730830; Mon, 07 Jun 2021 16:15:30 -0700 (PDT) Return-Path: Received: from leviathan (cpc1-cmbg19-2-0-cust915.5-4.cable.virginm.net. [82.27.183.148]) by smtp.gmail.com with ESMTPSA id i21sm873373wmq.12.2021.06.07.16.15.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jun 2021 16:15:30 -0700 (PDT) Date: Tue, 8 Jun 2021 00:15:28 +0100 From: "Leif Lindholm" To: Nhi Pham Cc: devel@edk2.groups.io, Vu Nguyen , Thang Nguyen , Chuong Tran , Phong Vo , Michael D Kinney , Ard Biesheuvel , Nate DeSimone Subject: Re: [edk2-platforms][PATCH v2 24/32] AmpereAltraPkg: Add configuration screen for CPU Message-ID: <20210607231528.77xrekpfvx3lnteb@leviathan> References: <20210526100724.5359-1-nhi@os.amperecomputing.com> <20210526100724.5359-26-nhi@os.amperecomputing.com> MIME-Version: 1.0 In-Reply-To: <20210526100724.5359-26-nhi@os.amperecomputing.com> Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Wed, May 26, 2021 at 17:07:16 +0700, Nhi Pham wrote: > From: Vu Nguyen > > This screen only supports to configure the SubNUMA mode currently. And what sort of info does it display? / Leif > > Cc: Thang Nguyen > Cc: Chuong Tran > Cc: Phong Vo > Cc: Leif Lindholm > Cc: Michael D Kinney > Cc: Ard Biesheuvel > Cc: Nate DeSimone > > Signed-off-by: Vu Nguyen > --- > Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dec | 3 + > Platform/Ampere/JadePkg/Jade.dsc | 1 + > Platform/Ampere/JadePkg/Jade.fdf | 1 + > Silicon/Ampere/AmpereAltraPkg/Drivers/CpuConfigDxe/CpuConfigDxe.inf | 58 +++ > Silicon/Ampere/AmpereAltraPkg/Drivers/CpuConfigDxe/CpuConfigDxe.h | 74 +++ > Silicon/Ampere/AmpereAltraPkg/Drivers/CpuConfigDxe/NVDataStruc.h | 19 + > Silicon/Ampere/AmpereAltraPkg/Include/Guid/CpuConfigHii.h | 19 + > Silicon/Ampere/AmpereAltraPkg/Drivers/CpuConfigDxe/Vfr.vfr | 43 ++ > Silicon/Ampere/AmpereAltraPkg/Drivers/CpuConfigDxe/CpuConfigDxe.c | 508 ++++++++++++++++++++ > Silicon/Ampere/AmpereAltraPkg/Drivers/CpuConfigDxe/VfrStrings.uni | 17 + > 10 files changed, 743 insertions(+) > > diff --git a/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dec b/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dec > index a372a4e0078b..05b4e8576836 100644 > --- a/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dec > +++ b/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dec > @@ -50,6 +50,9 @@ [LibraryClasses] > TrngLib|Silicon/Ampere/AmpereAltraPkg/Include/Library/TrngLib.h > > [Guids] > + # GUID for the CPU HII configuration form > + gCpuConfigFormSetGuid = { 0x43FAA144, 0xA2DF, 0x4050, { 0xA7, 0xFD, 0xEE, 0x17, 0xC9, 0xB8, 0x88, 0x8E } } > + > ## NVParam MM GUID > gNVParamMmGuid = { 0xE4AC5024, 0x29BE, 0x4ADC, { 0x93, 0x36, 0x87, 0xB5, 0xA0, 0x76, 0x23, 0x2D } } > > diff --git a/Platform/Ampere/JadePkg/Jade.dsc b/Platform/Ampere/JadePkg/Jade.dsc > index 75b3ece3817e..547fbb68b4e3 100755 > --- a/Platform/Ampere/JadePkg/Jade.dsc > +++ b/Platform/Ampere/JadePkg/Jade.dsc > @@ -180,3 +180,4 @@ [Components.common] > # > Silicon/Ampere/AmpereAltraPkg/Drivers/PlatformInfoDxe/PlatformInfoDxe.inf > Silicon/Ampere/AmpereAltraPkg/Drivers/MemInfoDxe/MemInfoDxe.inf > + Silicon/Ampere/AmpereAltraPkg/Drivers/CpuConfigDxe/CpuConfigDxe.inf > diff --git a/Platform/Ampere/JadePkg/Jade.fdf b/Platform/Ampere/JadePkg/Jade.fdf > index e71f3e79e6b3..b8342fde9d72 100755 > --- a/Platform/Ampere/JadePkg/Jade.fdf > +++ b/Platform/Ampere/JadePkg/Jade.fdf > @@ -355,5 +355,6 @@ [FV.FvMain] > # > INF Silicon/Ampere/AmpereAltraPkg/Drivers/PlatformInfoDxe/PlatformInfoDxe.inf > INF Silicon/Ampere/AmpereAltraPkg/Drivers/MemInfoDxe/MemInfoDxe.inf > + INF Silicon/Ampere/AmpereAltraPkg/Drivers/CpuConfigDxe/CpuConfigDxe.inf > > !include Platform/Ampere/AmperePlatformPkg/FvRules.fdf.inc > diff --git a/Silicon/Ampere/AmpereAltraPkg/Drivers/CpuConfigDxe/CpuConfigDxe.inf b/Silicon/Ampere/AmpereAltraPkg/Drivers/CpuConfigDxe/CpuConfigDxe.inf > new file mode 100755 > index 000000000000..a47d2b894b76 > --- /dev/null > +++ b/Silicon/Ampere/AmpereAltraPkg/Drivers/CpuConfigDxe/CpuConfigDxe.inf > @@ -0,0 +1,58 @@ > +## @file > +# > +# Copyright (c) 2020 - 2021, Ampere Computing LLC. All rights reserved.
> +# > +# SPDX-License-Identifier: BSD-2-Clause-Patent > +# > +## > + > +[Defines] > + INF_VERSION = 0x0001001B > + BASE_NAME = CpuConfigDxe > + MODULE_UNI_FILE = CpuConfigDxe.uni > + FILE_GUID = A20D8E6E-EE6C-43C5-809F-19BB930653AE > + MODULE_TYPE = DXE_DRIVER > + VERSION_STRING = 1.0 > + ENTRY_POINT = CpuConfigDxeEntryPoint > + > +[Sources.common] > + CpuConfigDxe.c > + CpuConfigDxe.h > + NVDataStruc.h > + Vfr.vfr > + VfrStrings.uni > + > +[Packages] > + MdeModulePkg/MdeModulePkg.dec > + MdePkg/MdePkg.dec > + Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dec > + Silicon/Ampere/AmpereSiliconPkg/AmpereSiliconPkg.dec > + > +[LibraryClasses] > + ArmLib > + BaseLib > + DebugLib > + DevicePathLib > + HiiLib > + HobLib > + IoLib > + MemoryAllocationLib > + NVParamLib > + PcdLib > + PrintLib > + UefiBootServicesTableLib > + UefiDriverEntryPoint > + UefiLib > + UefiRuntimeServicesTableLib > + > +[Protocols] > + gEfiHiiConfigRoutingProtocolGuid ## CONSUMES > + gEfiHiiConfigAccessProtocolGuid ## PRODUCES > + gEfiDevicePathProtocolGuid ## PRODUCES > + > +[Guids] > + gCpuConfigFormSetGuid > + gPlatformManagerFormsetGuid > + > +[Depex] > + TRUE > diff --git a/Silicon/Ampere/AmpereAltraPkg/Drivers/CpuConfigDxe/CpuConfigDxe.h b/Silicon/Ampere/AmpereAltraPkg/Drivers/CpuConfigDxe/CpuConfigDxe.h > new file mode 100644 > index 000000000000..930fbea6f9d7 > --- /dev/null > +++ b/Silicon/Ampere/AmpereAltraPkg/Drivers/CpuConfigDxe/CpuConfigDxe.h > @@ -0,0 +1,74 @@ > +/** @file > + > + Copyright (c) 2020 - 2021, Ampere Computing LLC. All rights reserved.
> + > + SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > + > +#ifndef CPU_CONFIG_H_ > +#define CPU_CONFIG_H_ > + > +#include > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include "NVDataStruc.h" > + > +// > +// This is the generated IFR binary data for each formset defined in VFR. > +// > +extern UINT8 VfrBin[]; > + > +// > +// This is the generated String package data for all .UNI files. > +// > +extern UINT8 CpuConfigDxeStrings[]; > + > +#define CPU_CONFIG_PRIVATE_SIGNATURE SIGNATURE_32 ('C', 'P', 'U', '_') > + > +typedef struct { > + UINTN Signature; > + > + EFI_HANDLE DriverHandle; > + EFI_HII_HANDLE HiiHandle; > + CPU_VARSTORE_DATA Configuration; > + > + EFI_HII_CONFIG_ROUTING_PROTOCOL *HiiConfigRouting; > + > + EFI_HII_CONFIG_ACCESS_PROTOCOL ConfigAccess; > +} CPU_CONFIG_PRIVATE_DATA; > + > +#define CPU_CONFIG_PRIVATE_FROM_THIS(a) CR (a, CPU_CONFIG_PRIVATE_DATA, ConfigAccess, CPU_CONFIG_PRIVATE_SIGNATURE) > + > +#pragma pack(1) > + > +/// > +/// HII specific Vendor Device Path definition. > +/// > +typedef struct { > + VENDOR_DEVICE_PATH VendorDevicePath; > + EFI_DEVICE_PATH_PROTOCOL End; > +} HII_VENDOR_DEVICE_PATH; > + > +#pragma pack() > + > +#endif /* CPU_CONFIG_H_ */ > diff --git a/Silicon/Ampere/AmpereAltraPkg/Drivers/CpuConfigDxe/NVDataStruc.h b/Silicon/Ampere/AmpereAltraPkg/Drivers/CpuConfigDxe/NVDataStruc.h > new file mode 100644 > index 000000000000..d906a395c04c > --- /dev/null > +++ b/Silicon/Ampere/AmpereAltraPkg/Drivers/CpuConfigDxe/NVDataStruc.h > @@ -0,0 +1,19 @@ > +/** @file > + > + Copyright (c) 2020 - 2021, Ampere Computing LLC. All rights reserved.
> + > + SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > + > +#ifndef CPU_NV_DATA_STRUC_H_ > +#define CPU_NV_DATA_STRUC_H_ > + > +#pragma pack(1) > +typedef struct { > + UINT32 CpuSubNumaMode; > +} CPU_VARSTORE_DATA; > + > +#pragma pack() > + > +#endif /* CPU_NV_DATA_STRUC_H_ */ > diff --git a/Silicon/Ampere/AmpereAltraPkg/Include/Guid/CpuConfigHii.h b/Silicon/Ampere/AmpereAltraPkg/Include/Guid/CpuConfigHii.h > new file mode 100644 > index 000000000000..71c8492f76a1 > --- /dev/null > +++ b/Silicon/Ampere/AmpereAltraPkg/Include/Guid/CpuConfigHii.h > @@ -0,0 +1,19 @@ > +/** @file > + > + Copyright (c) 2020 - 2021, Ampere Computing LLC. All rights reserved.
> + > + SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > + > +#ifndef CPU_CONFIG_HII_H_ > +#define CPU_CONFIG_HII_H_ > + > +#define CPU_CONFIGURATION_FORMSET_GUID \ > + { \ > + 0x43FAA144, 0xA2DF, 0x4050, { 0xA7, 0xFD, 0xEE, 0x17, 0xC9, 0xB8, 0x88, 0x8E } \ > + } > + > +extern EFI_GUID gCpuConfigFormSetGuid; > + > +#endif /* CPU_CONFIG_HII_H_ */ > diff --git a/Silicon/Ampere/AmpereAltraPkg/Drivers/CpuConfigDxe/Vfr.vfr b/Silicon/Ampere/AmpereAltraPkg/Drivers/CpuConfigDxe/Vfr.vfr > new file mode 100644 > index 000000000000..b085d030bbc5 > --- /dev/null > +++ b/Silicon/Ampere/AmpereAltraPkg/Drivers/CpuConfigDxe/Vfr.vfr > @@ -0,0 +1,43 @@ > +/** @file > + > + Copyright (c) 2020 - 2021, Ampere Computing LLC. All rights reserved.
> + > + SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > + > +#include > +#include > +#include > +#include "NVDataStruc.h" > + > +#define SUBNUMA_MODE_FORM_ID 1 > + > +formset > + guid = CPU_CONFIGURATION_FORMSET_GUID, > + title = STRING_TOKEN(STR_CPU_FORM), > + help = STRING_TOKEN(STR_CPU_FORM_HELP), > + classguid = gPlatformManagerFormsetGuid, > + > + varstore CPU_VARSTORE_DATA, > + name = CpuConfigNVData, > + guid = CPU_CONFIGURATION_FORMSET_GUID; > + > + form > + formid = SUBNUMA_MODE_FORM_ID, > + title = STRING_TOKEN(STR_CPU_FORM); > + subtitle text = STRING_TOKEN(STR_CPU_FORM_HELP); > + > + oneof > + varid = CpuConfigNVData.CpuSubNumaMode, > + prompt = STRING_TOKEN(STR_CPU_SUBNUMA_MODE_PROMPT), > + help = STRING_TOKEN(STR_CPU_SUBNUMA_MODE_HELP), > + flags = RESET_REQUIRED, > + option text = STRING_TOKEN(STR_CPU_SUBNUMA_MODE_MONOLITHIC), value = 0x0, flags = DEFAULT; > + option text = STRING_TOKEN(STR_CPU_SUBNUMA_MODE_HEMISPHERE), value = 0x1, flags = 0; > + option text = STRING_TOKEN(STR_CPU_SUBNUMA_MODE_QUADRANT), value = 0x2, flags = 0; > + endoneof; > + > + endform; > + > +endformset; > diff --git a/Silicon/Ampere/AmpereAltraPkg/Drivers/CpuConfigDxe/CpuConfigDxe.c b/Silicon/Ampere/AmpereAltraPkg/Drivers/CpuConfigDxe/CpuConfigDxe.c > new file mode 100644 > index 000000000000..da0deb74c156 > --- /dev/null > +++ b/Silicon/Ampere/AmpereAltraPkg/Drivers/CpuConfigDxe/CpuConfigDxe.c > @@ -0,0 +1,508 @@ > +/** @file > + > + Copyright (c) 2020 - 2021, Ampere Computing LLC. All rights reserved.
> + > + SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > + > +#include "CpuConfigDxe.h" > + > +// > +// Default settings definitions > +// > +#define NV_SI_SUBNUMA_MODE_DEFAULT 0x00 /* Monolithic mode */ > +#define WA_ERRATUM_1542419_DEFAULT 0x00 /* Disable I-Cache coherency */ > +#define NEAR_ATOMIC_DISABLE_DEFAULT 0x00 /* Enable Near Atomic */ > +#define CPU_SLC_REPLACE_POLICY 0x00 /* eLRU */ > + > +CHAR16 CpuVarstoreDataName[] = L"CpuConfigNVData"; > + > +EFI_HANDLE mDriverHandle = NULL; > +CPU_CONFIG_PRIVATE_DATA *mPrivateData = NULL; > + > +HII_VENDOR_DEVICE_PATH mCpuConfigHiiVendorDevicePath = { > + { > + { > + HARDWARE_DEVICE_PATH, > + HW_VENDOR_DP, > + { > + (UINT8)(sizeof (VENDOR_DEVICE_PATH)), > + (UINT8)((sizeof (VENDOR_DEVICE_PATH)) >> 8) > + } > + }, > + CPU_CONFIGURATION_FORMSET_GUID > + }, > + { > + END_DEVICE_PATH_TYPE, > + END_ENTIRE_DEVICE_PATH_SUBTYPE, > + { > + (UINT8)(END_DEVICE_PATH_LENGTH), > + (UINT8)((END_DEVICE_PATH_LENGTH) >> 8) > + } > + } > +}; > + > +STATIC > +EFI_STATUS > +CpuNvParamGet ( > + OUT CPU_VARSTORE_DATA *Configuration > + ) > +{ > + EFI_STATUS Status; > + UINT32 Value; > + > + ASSERT (Configuration != NULL); > + > + Status = NVParamGet ( > + NV_SI_SUBNUMA_MODE, > + NV_PERM_ATF | NV_PERM_BIOS | NV_PERM_MANU | NV_PERM_BMC, > + &Value > + ); > + if (EFI_ERROR (Status)) { > + DEBUG ((DEBUG_ERROR, "%a %d Fail to write NVParam \n", __FUNCTION__, __LINE__)); > + Configuration->CpuSubNumaMode = SUBNUMA_MODE_MONOLITHIC; > + } else { > + Configuration->CpuSubNumaMode = Value; > + } > + > + return EFI_SUCCESS; > +} > + > +STATIC > +EFI_STATUS > +CpuNvParamSet ( > + IN CPU_VARSTORE_DATA *Configuration > + ) > +{ > + EFI_STATUS Status; > + UINT32 Value; > + > + ASSERT (Configuration != NULL); > + > + Status = NVParamGet ( > + NV_SI_SUBNUMA_MODE, > + NV_PERM_ATF | NV_PERM_BIOS | NV_PERM_MANU | NV_PERM_BMC, > + &Value > + ); > + ASSERT_EFI_ERROR (Status); > + > + if (EFI_ERROR (Status) || Value != Configuration->CpuSubNumaMode) { > + Status = NVParamSet ( > + NV_SI_SUBNUMA_MODE, > + NV_PERM_ATF | NV_PERM_BIOS | NV_PERM_MANU | NV_PERM_BMC, > + NV_PERM_BIOS | NV_PERM_MANU, > + Configuration->CpuSubNumaMode > + ); > + if (EFI_ERROR (Status)) { > + DEBUG ((DEBUG_ERROR, "%a %d Fail to access NVParam \n", __FUNCTION__, __LINE__)); > + ASSERT_EFI_ERROR (Status); > + return Status; > + } > + } > + > + return EFI_SUCCESS; > +} > + > +STATIC > +EFI_STATUS > +SetupDefaultSettings ( > + VOID > + ) > +{ > + EFI_STATUS Status; > + UINT32 Value; > + > + // > + // Subnuma Mode > + // > + Status = NVParamGet ( > + NV_SI_SUBNUMA_MODE, > + NV_PERM_ATF | NV_PERM_BIOS | NV_PERM_MANU | NV_PERM_BMC, > + &Value > + ); > + if (EFI_ERROR (Status)) { > + Status = NVParamSet ( > + NV_SI_SUBNUMA_MODE, > + NV_PERM_ATF | NV_PERM_BIOS | NV_PERM_MANU | NV_PERM_BMC, > + NV_PERM_BIOS | NV_PERM_MANU, > + NV_SI_SUBNUMA_MODE_DEFAULT > + ); > + if (EFI_ERROR (Status)) { > + return Status; > + } > + } > + > + // > + // ARM ERRATA 1542419 workaround > + // > + Status = NVParamSet ( > + NV_SI_ERRATUM_1542419_WA, > + NV_PERM_ATF | NV_PERM_BIOS | NV_PERM_MANU | NV_PERM_BMC, > + NV_PERM_BIOS | NV_PERM_MANU, > + WA_ERRATUM_1542419_DEFAULT > + ); > + if (EFI_ERROR (Status)) { > + return Status; > + } > + > + // > + // Near atomic > + // > + Status = NVParamSet ( > + NV_SI_NEAR_ATOMIC_DISABLE, > + NV_PERM_ATF | NV_PERM_BIOS | NV_PERM_MANU | NV_PERM_BMC, > + NV_PERM_BIOS | NV_PERM_MANU, > + NEAR_ATOMIC_DISABLE_DEFAULT > + ); > + if (EFI_ERROR (Status)) { > + return Status; > + } > + > + // > + // SLC Replacement Policy > + // > + Status = NVParamSet ( > + NV_SI_HNF_AUX_CTL_32_63, > + NV_PERM_ATF | NV_PERM_BIOS | NV_PERM_MANU | NV_PERM_BMC, > + NV_PERM_BIOS | NV_PERM_MANU, > + CPU_SLC_REPLACE_POLICY > + ); > + if (EFI_ERROR (Status)) { > + return Status; > + } > + > + return EFI_SUCCESS; > +} > + > +/** > + This function allows a caller to extract the current configuration for one > + or more named elements from the target driver. > + > + @param This Points to the EFI_HII_CONFIG_ACCESS_PROTOCOL. > + @param Request A null-terminated Unicode string in > + format. > + @param Progress On return, points to a character in the Request > + string. Points to the string's null terminator if > + request was successful. Points to the most recent > + '&' before the first failing name/value pair (or > + the beginning of the string if the failure is in > + the first name/value pair) if the request was not > + successful. > + @param Results A null-terminated Unicode string in > + format which has all values filled > + in for the names in the Request string. String to > + be allocated by the called function. > + > + @retval EFI_SUCCESS The Results is filled with the requested values. > + @retval EFI_OUT_OF_RESOURCES Not enough memory to store the results. > + @retval EFI_INVALID_PARAMETER Request is illegal syntax, or unknown name. > + @retval EFI_NOT_FOUND Routing data doesn't match any storage in this > + driver. > + > +**/ > +EFI_STATUS > +EFIAPI > +CpuConfigExtractConfig ( > + IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL *This, > + IN CONST EFI_STRING Request, > + OUT EFI_STRING *Progress, > + OUT EFI_STRING *Results > + ) > +{ > + EFI_STATUS Status; > + UINTN BufferSize; > + CPU_CONFIG_PRIVATE_DATA *PrivateData; > + EFI_HII_CONFIG_ROUTING_PROTOCOL *HiiConfigRouting; > + EFI_STRING ConfigRequest; > + EFI_STRING ConfigRequestHdr; > + UINTN Size; > + BOOLEAN AllocatedRequest; > + > + if (Progress == NULL || Results == NULL) { > + return EFI_INVALID_PARAMETER; > + } > + // > + // Initialize the local variables. > + // > + ConfigRequestHdr = NULL; > + ConfigRequest = NULL; > + Size = 0; > + *Progress = Request; > + AllocatedRequest = FALSE; > + > + if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &gCpuConfigFormSetGuid, CpuVarstoreDataName)) { > + return EFI_NOT_FOUND; > + } > + > + PrivateData = CPU_CONFIG_PRIVATE_FROM_THIS (This); > + HiiConfigRouting = PrivateData->HiiConfigRouting; > + > + // > + // Get current setting from NVParam. > + // > + Status = CpuNvParamGet (&PrivateData->Configuration); > + if (EFI_ERROR (Status)) { > + return Status; > + } > + // > + // Convert buffer data to by helper function BlockToConfig() > + // > + BufferSize = sizeof (CPU_VARSTORE_DATA); > + ConfigRequest = Request; > + if ((Request == NULL) || (StrStr (Request, L"OFFSET") == NULL)) { > + // > + // Request has no request element, construct full request string. > + // Allocate and fill a buffer large enough to hold the template > + // followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator > + // > + ConfigRequestHdr = HiiConstructConfigHdr (&gCpuConfigFormSetGuid, CpuVarstoreDataName, PrivateData->DriverHandle); > + Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16); > + ConfigRequest = AllocateZeroPool (Size); > + ASSERT (ConfigRequest != NULL); > + if (ConfigRequest == NULL) { > + return EFI_OUT_OF_RESOURCES; > + } > + AllocatedRequest = TRUE; > + UnicodeSPrint (ConfigRequest, Size, L"%s&OFFSET=0&WIDTH=%016LX", ConfigRequestHdr, (UINT64)BufferSize); > + FreePool (ConfigRequestHdr); > + } > + > + // > + // Convert buffer data to by helper function BlockToConfig() > + // > + Status = HiiConfigRouting->BlockToConfig ( > + HiiConfigRouting, > + ConfigRequest, > + (UINT8 *)&PrivateData->Configuration, > + BufferSize, > + Results, > + Progress > + ); > + > + // > + // Free the allocated config request string. > + // > + if (AllocatedRequest) { > + FreePool (ConfigRequest); > + ConfigRequest = NULL; > + } > + > + // > + // Set Progress string to the original request string. > + // > + if (Request == NULL) { > + *Progress = NULL; > + } else if (StrStr (Request, L"OFFSET") == NULL) { > + *Progress = Request + StrLen (Request); > + } > + > + return Status; > +} > + > +/** > + This function processes the results of changes in configuration. > + > + @param This Points to the EFI_HII_CONFIG_ACCESS_PROTOCOL. > + @param Configuration A null-terminated Unicode string in > + format. > + @param Progress A pointer to a string filled in with the offset of > + the most recent '&' before the first failing > + name/value pair (or the beginning of the string if > + the failure is in the first name/value pair) or > + the terminating NULL if all was successful. > + > + @retval EFI_SUCCESS The Results is processed successfully. > + @retval EFI_INVALID_PARAMETER Configuration is NULL. > + @retval EFI_NOT_FOUND Routing data doesn't match any storage in this > + driver. > + > +**/ > +EFI_STATUS > +EFIAPI > +CpuConfigRouteConfig ( > + IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL *This, > + IN CONST EFI_STRING Configuration, > + OUT EFI_STRING *Progress > + ) > +{ > + EFI_STATUS Status; > + UINTN BufferSize; > + CPU_CONFIG_PRIVATE_DATA *PrivateData; > + EFI_HII_CONFIG_ROUTING_PROTOCOL *HiiConfigRouting; > + > + if (Configuration == NULL || Progress == NULL) { > + return EFI_INVALID_PARAMETER; > + } > + > + PrivateData = CPU_CONFIG_PRIVATE_FROM_THIS (This); > + HiiConfigRouting = PrivateData->HiiConfigRouting; > + *Progress = Configuration; > + > + // > + // Check routing data in . > + // Note: if only one Storage is used, then this checking could be skipped. > + // > + if (!HiiIsConfigHdrMatch (Configuration, &gCpuConfigFormSetGuid, CpuVarstoreDataName)) { > + return EFI_NOT_FOUND; > + } > + > + // > + // Get configuration data from NVParam > + // > + Status = CpuNvParamGet (&PrivateData->Configuration); > + if (EFI_ERROR (Status)) { > + return Status; > + } > + > + // > + // Convert to buffer data by helper function ConfigToBlock() > + // > + BufferSize = sizeof (CPU_VARSTORE_DATA); > + Status = HiiConfigRouting->ConfigToBlock ( > + HiiConfigRouting, > + Configuration, > + (UINT8 *)&PrivateData->Configuration, > + &BufferSize, > + Progress > + ); > + if (EFI_ERROR (Status)) { > + return Status; > + } > + > + // > + // Store configuration data back to NVParam > + // > + Status = CpuNvParamSet (&PrivateData->Configuration); > + if (EFI_ERROR (Status)) { > + return Status; > + } > + > + return Status; > +} > + > +/** > + This function processes the results of changes in configuration. > + > + @param This Points to the EFI_HII_CONFIG_ACCESS_PROTOCOL. > + @param Action Specifies the type of action taken by the browser. > + @param QuestionId A unique value which is sent to the original > + exporting driver so that it can identify the type > + of data to expect. > + @param Type The type of value for the question. > + @param Value A pointer to the data being sent to the original > + exporting driver. > + @param ActionRequest On return, points to the action requested by the > + callback function. > + > + @retval EFI_SUCCESS The callback successfully handled the action. > + @retval EFI_INVALID_PARAMETER The setup browser call this function with invalid parameters. > + > +**/ > +EFI_STATUS > +EFIAPI > +CpuConfigCallback ( > + IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL *This, > + IN EFI_BROWSER_ACTION Action, > + IN EFI_QUESTION_ID QuestionId, > + IN UINT8 Type, > + IN EFI_IFR_TYPE_VALUE *Value, > + OUT EFI_BROWSER_ACTION_REQUEST *ActionRequest > + ) > +{ > + if (Action != EFI_BROWSER_ACTION_CHANGING) { > + // > + // Do nothing for other UEFI Action. Only do call back when data is changed. > + // > + return EFI_UNSUPPORTED; > + } > + if (((Value == NULL) && (Action != EFI_BROWSER_ACTION_FORM_OPEN) && (Action != EFI_BROWSER_ACTION_FORM_CLOSE))|| > + (ActionRequest == NULL)) > + { > + return EFI_INVALID_PARAMETER; > + } > + > + return EFI_SUCCESS; > +} > + > +EFI_STATUS > +CpuConfigDxeEntryPoint ( > + IN EFI_HANDLE ImageHandle, > + IN EFI_SYSTEM_TABLE *SystemTable > + ) > +{ > + EFI_STATUS Status; > + EFI_HII_HANDLE HiiHandle; > + EFI_HII_CONFIG_ROUTING_PROTOCOL *HiiConfigRouting; > + > + // > + // Initialize driver private data > + // > + mPrivateData = AllocateZeroPool (sizeof (CPU_CONFIG_PRIVATE_DATA)); > + if (mPrivateData == NULL) { > + return EFI_OUT_OF_RESOURCES; > + } > + > + mPrivateData->Signature = CPU_CONFIG_PRIVATE_SIGNATURE; > + > + mPrivateData->ConfigAccess.ExtractConfig = CpuConfigExtractConfig; > + mPrivateData->ConfigAccess.RouteConfig = CpuConfigRouteConfig; > + mPrivateData->ConfigAccess.Callback = CpuConfigCallback; > + > + // > + // Locate ConfigRouting protocol > + // > + Status = gBS->LocateProtocol (&gEfiHiiConfigRoutingProtocolGuid, NULL, (VOID **)&HiiConfigRouting); > + if (EFI_ERROR (Status)) { > + return Status; > + } > + mPrivateData->HiiConfigRouting = HiiConfigRouting; > + > + Status = gBS->InstallMultipleProtocolInterfaces ( > + &mDriverHandle, > + &gEfiDevicePathProtocolGuid, > + &mCpuConfigHiiVendorDevicePath, > + &gEfiHiiConfigAccessProtocolGuid, > + &mPrivateData->ConfigAccess, > + NULL > + ); > + ASSERT_EFI_ERROR (Status); > + > + mPrivateData->DriverHandle = mDriverHandle; > + > + // > + // Publish our HII data > + // > + HiiHandle = HiiAddPackages ( > + &gCpuConfigFormSetGuid, > + mDriverHandle, > + CpuConfigDxeStrings, > + VfrBin, > + NULL > + ); > + if (HiiHandle == NULL) { > + gBS->UninstallMultipleProtocolInterfaces ( > + mDriverHandle, > + &gEfiDevicePathProtocolGuid, > + &mCpuConfigHiiVendorDevicePath, > + &gEfiHiiConfigAccessProtocolGuid, > + &mPrivateData->ConfigAccess, > + NULL > + ); > + return EFI_OUT_OF_RESOURCES; > + } > + > + mPrivateData->HiiHandle = HiiHandle; > + > + // > + // With the fresh system, the NVParam value is invalid (0xFFFFFFFF). > + // It causes reading from the NVParam is failed. > + // So, the NVParam should be setting with default values if any params is invalid. > + // > + Status = SetupDefaultSettings (); > + if (EFI_ERROR (Status)) { > + return Status; > + } > + > + return EFI_SUCCESS; > +} > diff --git a/Silicon/Ampere/AmpereAltraPkg/Drivers/CpuConfigDxe/VfrStrings.uni b/Silicon/Ampere/AmpereAltraPkg/Drivers/CpuConfigDxe/VfrStrings.uni > new file mode 100644 > index 000000000000..70c01f65e4b6 > --- /dev/null > +++ b/Silicon/Ampere/AmpereAltraPkg/Drivers/CpuConfigDxe/VfrStrings.uni > @@ -0,0 +1,17 @@ > +// > +// Copyright (c) 2020 - 2021, Ampere Computing LLC. All rights reserved.
> +// > +// SPDX-License-Identifier: BSD-2-Clause-Patent > +// > + > +#langdef en-US "English" > + > +#string STR_CPU_FORM #language en-US "CPU Configuration" > +#string STR_CPU_FORM_HELP #language en-US "CPU Configuration" > +#string STR_CPU_FORM_SEPERATE_LINE #language en-US "" > + > +#string STR_CPU_SUBNUMA_MODE_PROMPT #language en-US "ANC mode" > +#string STR_CPU_SUBNUMA_MODE_HELP #language en-US "Provides 3 modes: Monolithic, Hemisphere, Quadrant. System with Monolithic mode has single NUMA partition per socket. System with Hemisphere has 2 NUMA partitions per socket. System with Quandrant has 4 NUMA partitions per socket" > +#string STR_CPU_SUBNUMA_MODE_MONOLITHIC #language en-US "Monolithic" > +#string STR_CPU_SUBNUMA_MODE_HEMISPHERE #language en-US "Hemisphere" > +#string STR_CPU_SUBNUMA_MODE_QUADRANT #language en-US "Quadrant" > -- > 2.17.1 >