[edk2-devel] [edk2-platforms][PATCH v2 25/32] AmpereAltraPkg: Add configuration screen for ACPI

Nhi Pham via groups.io posted 32 patches 4 years, 8 months ago
There is a newer version of this series
[edk2-devel] [edk2-platforms][PATCH v2 25/32] AmpereAltraPkg: Add configuration screen for ACPI
Posted by Nhi Pham via groups.io 4 years, 8 months ago
This supports:
* Enable/Disable APEI Support
* Enable/Disable CPPC Support
* Enable/Disable LPI support
* Enable/Disable Max Performance Mode

Cc: Thang Nguyen <thang@os.amperecomputing.com>
Cc: Chuong Tran <chuong@os.amperecomputing.com>
Cc: Phong Vo <phong@os.amperecomputing.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>

Signed-off-by: Nhi Pham <nhi@os.amperecomputing.com>
---
 Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dec                      |   3 +
 Platform/Ampere/JadePkg/Jade.dsc                                      |   1 +
 Platform/Ampere/JadePkg/Jade.fdf                                      |   1 +
 Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf   |   1 +
 Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/AcpiConfigDxe.inf |  56 ++
 Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiApei.h            |   2 +
 Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/AcpiConfigDxe.h   |  85 +++
 Silicon/Ampere/AmpereAltraPkg/Include/AcpiNVDataStruc.h               |  28 +
 Silicon/Ampere/AmpereAltraPkg/Include/Guid/AcpiConfigFormSet.h        |  19 +
 Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/Vfr.vfr           |  69 ++
 Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiApei.c            |  23 +-
 Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/AcpiConfigDxe.c   | 733 ++++++++++++++++++++
 Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/VfrStrings.uni    |  27 +
 13 files changed, 1046 insertions(+), 2 deletions(-)

diff --git a/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dec b/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dec
index 05b4e8576836..ede85d3a3421 100644
--- a/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dec
+++ b/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dec
@@ -53,6 +53,9 @@ [Guids]
   # GUID for the CPU HII configuration form
   gCpuConfigFormSetGuid        = { 0x43FAA144, 0xA2DF, 0x4050, { 0xA7, 0xFD, 0xEE, 0x17, 0xC9, 0xB8, 0x88, 0x8E } }
 
+  # GUID for the ACPI HII configuration form
+  gAcpiConfigFormSetGuid = { 0x0ceb6764, 0xd415, 0x4b01, { 0xa8, 0x43, 0xd1, 0x01, 0xbc, 0xb0, 0xd8, 0x29 } }
+
   ## 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 547fbb68b4e3..e82b0cce691a 100755
--- a/Platform/Ampere/JadePkg/Jade.dsc
+++ b/Platform/Ampere/JadePkg/Jade.dsc
@@ -181,3 +181,4 @@ [Components.common]
   Silicon/Ampere/AmpereAltraPkg/Drivers/PlatformInfoDxe/PlatformInfoDxe.inf
   Silicon/Ampere/AmpereAltraPkg/Drivers/MemInfoDxe/MemInfoDxe.inf
   Silicon/Ampere/AmpereAltraPkg/Drivers/CpuConfigDxe/CpuConfigDxe.inf
+  Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/AcpiConfigDxe.inf
diff --git a/Platform/Ampere/JadePkg/Jade.fdf b/Platform/Ampere/JadePkg/Jade.fdf
index b8342fde9d72..ddd601075f19 100755
--- a/Platform/Ampere/JadePkg/Jade.fdf
+++ b/Platform/Ampere/JadePkg/Jade.fdf
@@ -356,5 +356,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
+  INF Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/AcpiConfigDxe.inf
 
 !include Platform/Ampere/AmperePlatformPkg/FvRules.fdf.inc
diff --git a/Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf b/Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf
index a1a323eee472..287b4eadbf4a 100644
--- a/Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf
+++ b/Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf
@@ -64,6 +64,7 @@ [Guids]
   gArmMpCoreInfoGuid
   gEfiAcpiTableGuid
   gEfiEventReadyToBootGuid
+  gAcpiConfigFormSetGuid
   gPlatformHobGuid
 
 [Protocols]
diff --git a/Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/AcpiConfigDxe.inf b/Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/AcpiConfigDxe.inf
new file mode 100644
index 000000000000..bc2fbebc84d1
--- /dev/null
+++ b/Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/AcpiConfigDxe.inf
@@ -0,0 +1,56 @@
+## @file
+#
+# Copyright (c) 2020 - 2021, Ampere Computing LLC. All rights reserved.<BR>
+#
+# SPDX-License-Identifier: BSD-2-Clause-Patent
+#
+##
+
+[Defines]
+  INF_VERSION                    = 0x0001001B
+  BASE_NAME                      = AcpiConfigDxe
+  FILE_GUID                      = F36685AE-2623-4231-ABC0-2C151451E6B7
+  MODULE_TYPE                    = DXE_DRIVER
+  VERSION_STRING                 = 1.0
+  ENTRY_POINT                    = AcpiConfigEntryPoint
+
+[Sources.common]
+  AcpiConfigDxe.c
+  AcpiConfigDxe.h
+  Vfr.vfr
+  VfrStrings.uni
+
+[Packages]
+  MdeModulePkg/MdeModulePkg.dec
+  MdePkg/MdePkg.dec
+  Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dec
+  Silicon/Ampere/AmpereSiliconPkg/AmpereSiliconPkg.dec
+
+[LibraryClasses]
+  AcpiHelperLib
+  BaseLib
+  BaseMemoryLib
+  DebugLib
+  DevicePathLib
+  HiiLib
+  HobLib
+  MemoryAllocationLib
+  SystemFirmwareInterfaceLib
+  UefiBootServicesTableLib
+  UefiDriverEntryPoint
+  UefiLib
+
+[Guids]
+  gPlatformManagerFormsetGuid
+  gAcpiConfigFormSetGuid
+  gEfiEventReadyToBootGuid
+  gPlatformHobGuid
+
+[Protocols]
+  gEfiDevicePathProtocolGuid                    ## CONSUMES
+  gEfiHiiConfigRoutingProtocolGuid              ## CONSUMES
+  gEfiHiiConfigAccessProtocolGuid               ## PRODUCES
+
+[Depex]
+  gEfiVariableArchProtocolGuid AND
+  gEfiVariableWriteArchProtocolGuid
diff --git a/Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiApei.h b/Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiApei.h
index c207142459ad..5a0ce9dcc69a 100644
--- a/Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiApei.h
+++ b/Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiApei.h
@@ -9,7 +9,9 @@
 #ifndef ACPI_APEI_H_
 #define ACPI_APEI_H_
 
+#include <AcpiNVDataStruc.h>
 #include <Base.h>
+#include <Guid/AcpiConfigFormSet.h>
 #include <IndustryStandard/Acpi63.h>
 #include <Library/AcpiHelperLib.h>
 #include <Library/AmpereCpuLib.h>
diff --git a/Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/AcpiConfigDxe.h b/Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/AcpiConfigDxe.h
new file mode 100644
index 000000000000..45cb08e01f7b
--- /dev/null
+++ b/Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/AcpiConfigDxe.h
@@ -0,0 +1,85 @@
+/** @file
+
+  Copyright (c) 2020 - 2021, Ampere Computing LLC. All rights reserved.<BR>
+
+  SPDX-License-Identifier: BSD-2-Clause-Patent
+
+**/
+
+#ifndef DRIVER_SAMPLE_H_
+#define DRIVER_SAMPLE_H_
+
+#include <Uefi.h>
+
+#include <AcpiNVDataStruc.h>
+#include <Guid/AcpiConfigFormSet.h>
+#include <Guid/MdeModuleHii.h>
+#include <Guid/PlatformInfoHobGuid.h>
+#include <Library/AcpiHelperLib.h>
+#include <Library/AcpiHelperLib.h>
+#include <Library/BaseLib.h>
+#include <Library/BaseMemoryLib.h>
+#include <Library/DebugLib.h>
+#include <Library/DevicePathLib.h>
+#include <Library/HiiLib.h>
+#include <Library/HobLib.h>
+#include <Library/MemoryAllocationLib.h>
+#include <Library/SystemFirmwareInterfaceLib.h>
+#include <Library/PrintLib.h>
+#include <Library/UefiBootServicesTableLib.h>
+#include <Library/UefiDriverEntryPoint.h>
+#include <Library/UefiLib.h>
+#include <Library/UefiRuntimeServicesTableLib.h>
+#include <PlatformInfoHob.h>
+#include <Protocol/AcpiSystemDescriptionTable.h>
+#include <Protocol/HiiConfigAccess.h>
+#include <Protocol/HiiConfigRouting.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 AcpiConfigDxeStrings[];
+
+#define ACPI_CONFIG_PRIVATE_SIGNATURE SIGNATURE_32 ('A', 'C', 'P', 'I')
+
+typedef struct {
+  UINTN Signature;
+
+  EFI_HANDLE                DriverHandle;
+  EFI_HII_HANDLE            HiiHandle;
+  ACPI_CONFIG_VARSTORE_DATA Configuration;
+  PLATFORM_INFO_HOB         *PlatformHob;
+  EFI_ACPI_SDT_PROTOCOL     *AcpiTableProtocol;
+  EFI_ACPI_HANDLE           AcpiTableHandle;
+
+  //
+  // Consumed protocol
+  //
+  EFI_HII_CONFIG_ROUTING_PROTOCOL *HiiConfigRouting;
+
+  //
+  // Produced protocol
+  //
+  EFI_HII_CONFIG_ACCESS_PROTOCOL ConfigAccess;
+} ACPI_CONFIG_PRIVATE_DATA;
+
+#define ACPI_CONFIG_PRIVATE_FROM_THIS(a)  CR (a, ACPI_CONFIG_PRIVATE_DATA, ConfigAccess, ACPI_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
diff --git a/Silicon/Ampere/AmpereAltraPkg/Include/AcpiNVDataStruc.h b/Silicon/Ampere/AmpereAltraPkg/Include/AcpiNVDataStruc.h
new file mode 100644
index 000000000000..17f80113797d
--- /dev/null
+++ b/Silicon/Ampere/AmpereAltraPkg/Include/AcpiNVDataStruc.h
@@ -0,0 +1,28 @@
+/** @file
+
+  Copyright (c) 2020 - 2021, Ampere Computing LLC. All rights reserved.<BR>
+
+  SPDX-License-Identifier: BSD-2-Clause-Patent
+
+**/
+
+#ifndef ACPI_NV_DATA_STRUC_H_
+#define ACPI_NV_DATA_STRUC_H_
+
+#pragma pack(1)
+
+//
+// ACPI Configuration NV data structure definition
+//
+typedef struct {
+  UINT32 EnableApeiSupport;
+  UINT32 AcpiCppcEnable;
+  UINT32 AcpiLpiEnable;
+  UINT32 AcpiTurboSupport;
+  UINT32 AcpiTurboMode;
+  UINT32 Reserved[4];
+} ACPI_CONFIG_VARSTORE_DATA;
+
+#pragma pack()
+
+#endif /* ACPI_NV_DATA_STRUC_H_ */
diff --git a/Silicon/Ampere/AmpereAltraPkg/Include/Guid/AcpiConfigFormSet.h b/Silicon/Ampere/AmpereAltraPkg/Include/Guid/AcpiConfigFormSet.h
new file mode 100644
index 000000000000..1779a4543769
--- /dev/null
+++ b/Silicon/Ampere/AmpereAltraPkg/Include/Guid/AcpiConfigFormSet.h
@@ -0,0 +1,19 @@
+/** @file
+
+  Copyright (c) 2020 - 2021, Ampere Computing LLC. All rights reserved.<BR>
+
+  SPDX-License-Identifier: BSD-2-Clause-Patent
+
+**/
+
+#ifndef ACPI_CONFIG_FORMSET_GUID_H_
+#define ACPI_CONFIG_FORMSET_GUID_H_
+
+#define ACPI_CONFIGURATION_FORMSET_GUID \
+  { \
+    0x0ceb6764, 0xd415, 0x4b01, { 0xa8, 0x43, 0xd1, 0x01, 0xbc, 0xb0, 0xd8, 0x29 } \
+  }
+
+extern EFI_GUID gAcpiConfigFormSetGuid;
+
+#endif /* ACPI_CONFIG_FORMSET_GUID_H_ */
diff --git a/Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/Vfr.vfr b/Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/Vfr.vfr
new file mode 100644
index 000000000000..6cbd896987b5
--- /dev/null
+++ b/Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/Vfr.vfr
@@ -0,0 +1,69 @@
+/** @file
+
+  Copyright (c) 2020 - 2021, Ampere Computing LLC. All rights reserved.<BR>
+
+  SPDX-License-Identifier: BSD-2-Clause-Patent
+
+**/
+
+
+#include <Guid/AcpiConfigFormSet.h>
+#include <AcpiNVDataStruc.h>
+
+#define ACPI_CONFIG_FORM_ID  1
+
+formset
+  guid      = ACPI_CONFIGURATION_FORMSET_GUID,
+  title     = STRING_TOKEN(STR_ACPI_FORM),
+  help      = STRING_TOKEN(STR_ACPI_FORM_HELP),
+  classguid = gPlatformManagerFormsetGuid,
+
+  varstore ACPI_CONFIG_VARSTORE_DATA,
+    name  = AcpiConfigNVData,
+    guid  = ACPI_CONFIGURATION_FORMSET_GUID;
+
+  form
+    formid = ACPI_CONFIG_FORM_ID,
+    title  = STRING_TOKEN(STR_ACPI_FORM);
+    subtitle text = STRING_TOKEN(STR_ACPI_FORM_HELP);
+
+    oneof
+      varid   = AcpiConfigNVData.EnableApeiSupport,
+      prompt  = STRING_TOKEN(STR_ACPI_APEI_SUPPORT_PROMPT),
+      help    = STRING_TOKEN(STR_ACPI_APEI_SUPPORT_HELP),
+      option text = STRING_TOKEN(STR_ACPI_COMMON_DISABLE), value = 0, flags = 0;
+      option text = STRING_TOKEN(STR_ACPI_COMMON_ENABLE), value = 1, flags = DEFAULT;
+    endoneof;
+
+    oneof
+      varid   = AcpiConfigNVData.AcpiCppcEnable,
+      prompt  = STRING_TOKEN(STR_ACPI_CPPC_PROMPT),
+      help    = STRING_TOKEN(STR_ACPI_CPPC_HELP),
+      option text = STRING_TOKEN(STR_ACPI_COMMON_DISABLE), value = 0, flags = 0;
+      option text = STRING_TOKEN(STR_ACPI_COMMON_ENABLE), value = 1, flags = DEFAULT;
+    endoneof;
+
+    oneof
+      varid   = AcpiConfigNVData.AcpiLpiEnable,
+      prompt  = STRING_TOKEN(STR_ACPI_LPI_PROMPT),
+      help    = STRING_TOKEN(STR_ACPI_LPI_HELP),
+      option text = STRING_TOKEN(STR_ACPI_COMMON_DISABLE), value = 0, flags = 0;
+      option text = STRING_TOKEN(STR_ACPI_COMMON_ENABLE), value = 1, flags = DEFAULT;
+    endoneof;
+
+    grayoutif ideqval AcpiConfigNVData.AcpiTurboSupport == 0;
+      oneof
+        varid   = AcpiConfigNVData.AcpiTurboMode,
+        prompt  = STRING_TOKEN(STR_ACPI_TURBO_PROMPT),
+        help    = STRING_TOKEN(STR_ACPI_TURBO_HELP),
+        option text = STRING_TOKEN(STR_ACPI_COMMON_ENABLE), value = 1, flags = DEFAULT;
+        option text = STRING_TOKEN(STR_ACPI_COMMON_DISABLE), value = 0, flags = 0;
+        suppressif ideqval AcpiConfigNVData.AcpiTurboSupport > 0;
+        option text = STRING_TOKEN(STR_ACPI_UNSUPPORTED), value = 2, flags = 0;
+        endif;
+      endoneof;
+    endif;
+
+  endform;
+
+endformset;
diff --git a/Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiApei.c b/Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiApei.c
index fa188c7776db..3ec63250a5de 100644
--- a/Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiApei.c
+++ b/Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiApei.c
@@ -445,8 +445,27 @@ AcpiApeiUpdate (
   VOID
   )
 {
-  if (!IsSlaveSocketActive ()) {
-    AcpiApeiHestUpdateTable1P ();
+  EFI_STATUS                Status;
+  ACPI_CONFIG_VARSTORE_DATA AcpiConfigData;
+  UINTN                     BufferSize;
+
+  BufferSize = sizeof (ACPI_CONFIG_VARSTORE_DATA);
+  Status = gRT->GetVariable (
+                  L"AcpiConfigNVData",
+                  &gAcpiConfigFormSetGuid,
+                  NULL,
+                  &BufferSize,
+                  &AcpiConfigData
+                  );
+  if (!EFI_ERROR (Status) && (AcpiConfigData.EnableApeiSupport == 0)) {
+    AcpiApeiUninstallTable (EFI_ACPI_6_3_BOOT_ERROR_RECORD_TABLE_SIGNATURE);
+    AcpiApeiUninstallTable (EFI_ACPI_6_3_HARDWARE_ERROR_SOURCE_TABLE_SIGNATURE);
+    AcpiApeiUninstallTable (EFI_ACPI_6_3_SOFTWARE_DELEGATED_EXCEPTIONS_INTERFACE_TABLE_SIGNATURE);
+    AcpiApeiUninstallTable (EFI_ACPI_6_3_ERROR_INJECTION_TABLE_SIGNATURE);
+  } else {
+    if (!IsSlaveSocketActive ()) {
+      AcpiApeiHestUpdateTable1P ();
+    }
   }
 
   if (!IsSdeiEnabled ()) {
diff --git a/Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/AcpiConfigDxe.c b/Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/AcpiConfigDxe.c
new file mode 100644
index 000000000000..ea9004ef2e3c
--- /dev/null
+++ b/Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/AcpiConfigDxe.c
@@ -0,0 +1,733 @@
+/** @file
+
+  Copyright (c) 2020 - 2021, Ampere Computing LLC. All rights reserved.<BR>
+
+  SPDX-License-Identifier: BSD-2-Clause-Patent
+
+**/
+
+#include "AcpiConfigDxe.h"
+
+#define ACPI_VARSTORE_ATTRIBUTES EFI_VARIABLE_BOOTSERVICE_ACCESS | \
+                                 EFI_VARIABLE_RUNTIME_ACCESS     | \
+                                 EFI_VARIABLE_NON_VOLATILE
+
+CHAR16 AcpiVarstoreDataName[] = L"AcpiConfigNVData";
+
+EFI_HANDLE               mDriverHandle = NULL;
+ACPI_CONFIG_PRIVATE_DATA *mPrivateData = NULL;
+
+HII_VENDOR_DEVICE_PATH mAcpiConfigHiiVendorDevicePath = {
+  {
+    {
+      HARDWARE_DEVICE_PATH,
+      HW_VENDOR_DP,
+      {
+        (UINT8)(sizeof (VENDOR_DEVICE_PATH)),
+        (UINT8)((sizeof (VENDOR_DEVICE_PATH)) >> 8)
+      }
+    },
+    ACPI_CONFIGURATION_FORMSET_GUID
+  },
+  {
+    END_DEVICE_PATH_TYPE,
+    END_ENTIRE_DEVICE_PATH_SUBTYPE,
+    {
+      (UINT8)(END_DEVICE_PATH_LENGTH),
+      (UINT8)((END_DEVICE_PATH_LENGTH) >> 8)
+    }
+  }
+};
+
+/**
+  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
+                                 <ConfigRequest> 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
+                                 <ConfigAltResp> 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
+ExtractConfig (
+  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;
+  ACPI_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, &gAcpiConfigFormSetGuid, AcpiVarstoreDataName)) {
+    return EFI_NOT_FOUND;
+  }
+
+  PrivateData = ACPI_CONFIG_PRIVATE_FROM_THIS (This);
+  HiiConfigRouting = PrivateData->HiiConfigRouting;
+
+  //
+  // Get Buffer Storage data from EFI variable.
+  // Try to get the current setting from variable.
+  //
+  BufferSize = sizeof (ACPI_CONFIG_VARSTORE_DATA);
+  Status = gRT->GetVariable (
+                  AcpiVarstoreDataName,
+                  &gAcpiConfigFormSetGuid,
+                  NULL,
+                  &BufferSize,
+                  &PrivateData->Configuration
+                  );
+  if (EFI_ERROR (Status)) {
+    return EFI_NOT_FOUND;
+  }
+
+  //
+  // Convert buffer data to <ConfigResp> by helper function BlockToConfig()
+  //
+  BufferSize = sizeof (ACPI_CONFIG_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 <ConfigHdr> template
+    // followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator
+    //
+    ConfigRequestHdr = HiiConstructConfigHdr (
+                         &gAcpiConfigFormSetGuid,
+                         AcpiVarstoreDataName,
+                         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 <ConfigResp> 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 <ConfigResp>
+                                 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
+RouteConfig (
+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL *This,
+  IN  CONST EFI_STRING                     Configuration,
+  OUT EFI_STRING                           *Progress
+  )
+{
+  EFI_STATUS                      Status;
+  UINTN                           BufferSize;
+  ACPI_CONFIG_PRIVATE_DATA        *PrivateData;
+  EFI_HII_CONFIG_ROUTING_PROTOCOL *HiiConfigRouting;
+
+  if (Configuration == NULL || Progress == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  PrivateData = ACPI_CONFIG_PRIVATE_FROM_THIS (This);
+  HiiConfigRouting = PrivateData->HiiConfigRouting;
+  *Progress = Configuration;
+
+  //
+  // Check routing data in <ConfigHdr>.
+  // Note: if only one Storage is used, then this checking could be skipped.
+  //
+  if (!HiiIsConfigHdrMatch (Configuration, &gAcpiConfigFormSetGuid, AcpiVarstoreDataName)) {
+    return EFI_NOT_FOUND;
+  }
+
+  //
+  // Get Buffer Storage data from EFI variable
+  //
+  BufferSize = sizeof (ACPI_CONFIG_VARSTORE_DATA);
+  Status = gRT->GetVariable (
+                  AcpiVarstoreDataName,
+                  &gAcpiConfigFormSetGuid,
+                  NULL,
+                  &BufferSize,
+                  &PrivateData->Configuration
+                  );
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+
+  //
+  // Convert <ConfigResp> to buffer data by helper function ConfigToBlock()
+  //
+  BufferSize = sizeof (ACPI_CONFIG_VARSTORE_DATA);
+  Status = HiiConfigRouting->ConfigToBlock (
+                               HiiConfigRouting,
+                               Configuration,
+                               (UINT8 *)&PrivateData->Configuration,
+                               &BufferSize,
+                               Progress
+                               );
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+
+  //
+  // Store Buffer Storage back to EFI variable
+  //
+  Status = gRT->SetVariable (
+                  AcpiVarstoreDataName,
+                  &gAcpiConfigFormSetGuid,
+                  ACPI_VARSTORE_ATTRIBUTES,
+                  sizeof (ACPI_CONFIG_VARSTORE_DATA),
+                  &PrivateData->Configuration
+                  );
+
+  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
+DriverCallback (
+  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;
+}
+
+STATIC
+EFI_STATUS
+AcpiNVDataUpdate (
+  IN ACPI_CONFIG_PRIVATE_DATA *PrivateData
+  )
+{
+  EFI_STATUS         Status;
+  PLATFORM_INFO_HOB  *PlatformHob;
+  UINT32             TurboSupport;
+
+  ASSERT (PrivateData != NULL);
+
+  PlatformHob = PrivateData->PlatformHob;
+  TurboSupport = PlatformHob->TurboCapability[0] + PlatformHob->TurboCapability[1];
+
+  if (TurboSupport == 0) {
+    PrivateData->Configuration.AcpiTurboMode = 2; // Unsupported mode
+    PrivateData->Configuration.AcpiTurboSupport = 0;
+  } else {
+    PrivateData->Configuration.AcpiTurboSupport = 1;
+  }
+
+  Status = gRT->SetVariable (
+                  AcpiVarstoreDataName,
+                  &gAcpiConfigFormSetGuid,
+                  ACPI_VARSTORE_ATTRIBUTES,
+                  sizeof (ACPI_CONFIG_VARSTORE_DATA),
+                  &PrivateData->Configuration
+                  );
+  if (EFI_ERROR (Status)) {
+    DEBUG ((DEBUG_ERROR, "%a %d gRT->SetVariable() failed \n", __FUNCTION__, __LINE__));
+    return Status;
+  }
+
+  return EFI_SUCCESS;
+}
+
+STATIC
+EFI_STATUS
+UpdateTurboModeConfig (
+  IN ACPI_CONFIG_PRIVATE_DATA *PrivateData
+  )
+{
+  EFI_STATUS         Status;
+  PLATFORM_INFO_HOB  *PlatformHob;
+  BOOLEAN            EnableTurbo;
+
+  ASSERT (PrivateData != NULL);
+
+  if (PrivateData->Configuration.AcpiTurboSupport != 0) {
+    PlatformHob = PrivateData->PlatformHob;
+    EnableTurbo = (PrivateData->Configuration.AcpiTurboMode != 0) ? TRUE : FALSE;
+
+    if (PlatformHob->TurboCapability[0] != 0) {
+      Status = MailboxMsgTurboConfig (0, EnableTurbo);
+      if (EFI_ERROR (Status)) {
+        return Status;
+      }
+    }
+
+    if (PlatformHob->TurboCapability[1] != 0) {
+      Status = MailboxMsgTurboConfig (1, EnableTurbo);
+      if (EFI_ERROR (Status)) {
+        return Status;
+      }
+    }
+  } else {
+    DEBUG ((DEBUG_INFO, "%a: Turbo mode is unsupported! \n", __FUNCTION__));
+  }
+
+  return EFI_SUCCESS;
+}
+
+STATIC
+EFI_STATUS
+UpdateCPPCConfig (
+  IN ACPI_CONFIG_PRIVATE_DATA *PrivateData
+  )
+{
+  EFI_STATUS            Status;
+  EFI_ACPI_HANDLE       ChildHandle;
+  CHAR8                 Buffer[64];
+  EFI_ACPI_DATA_TYPE    DataType;
+  UINTN                 DataSize;
+  UINT8                 *Data;
+  EFI_ACPI_SDT_PROTOCOL *AcpiTableProtocol;
+
+  ASSERT (PrivateData != NULL);
+
+  AcpiTableProtocol = PrivateData->AcpiTableProtocol;
+
+  AsciiSPrint (Buffer, sizeof (Buffer), "\\_SB.CPCE");
+  Status = AcpiTableProtocol->FindPath (
+                                PrivateData->AcpiTableHandle,
+                                (VOID *)Buffer,
+                                &ChildHandle
+                                );
+  if (EFI_ERROR (Status)) {
+    DEBUG ((DEBUG_ERROR, "Failed to find path CPCE\n"));
+    AcpiTableProtocol->Close (PrivateData->AcpiTableHandle);
+    return Status;
+  }
+
+  Status = AcpiTableProtocol->GetOption (
+                                ChildHandle,
+                                2,
+                                &DataType,
+                                (VOID *)&Data,
+                                &DataSize
+                                );
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+  Data[0] = PrivateData->Configuration.AcpiCppcEnable;
+
+  return EFI_SUCCESS;
+}
+
+STATIC
+EFI_STATUS
+UpdateLPIConfig (
+  IN ACPI_CONFIG_PRIVATE_DATA *PrivateData
+  )
+{
+  EFI_STATUS            Status;
+  EFI_ACPI_HANDLE       ChildHandle;
+  CHAR8                 Buffer[64];
+  EFI_ACPI_DATA_TYPE    DataType;
+  UINTN                 DataSize;
+  UINT8                 *Data;
+  EFI_ACPI_SDT_PROTOCOL *AcpiTableProtocol;
+
+  ASSERT (PrivateData != NULL);
+
+  AcpiTableProtocol = PrivateData->AcpiTableProtocol;
+
+  AsciiSPrint (Buffer, sizeof (Buffer), "\\_SB.LPIE");
+  Status = AcpiTableProtocol->FindPath (
+                                PrivateData->AcpiTableHandle,
+                                (VOID *)Buffer,
+                                &ChildHandle
+                                );
+  if (EFI_ERROR (Status)) {
+    DEBUG ((DEBUG_ERROR, "Fail to find path LPIE\n"));
+    AcpiTableProtocol->Close (PrivateData->AcpiTableHandle);
+    return Status;
+  }
+
+  Status = AcpiTableProtocol->GetOption (
+                                ChildHandle,
+                                2,
+                                &DataType,
+                                (VOID *)&Data,
+                                &DataSize
+                                );
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+  Data[0] = PrivateData->Configuration.AcpiLpiEnable;
+
+  return EFI_SUCCESS;
+}
+
+STATIC
+VOID
+UpdateAcpiOnReadyToBoot (
+  IN EFI_EVENT Event,
+  IN VOID      *Context
+  )
+{
+  EFI_STATUS            Status;
+  EFI_ACPI_SDT_PROTOCOL *AcpiTableProtocol;
+  EFI_ACPI_HANDLE       TableHandle;
+
+  ASSERT (mPrivateData != NULL);
+
+  //
+  // Find the AcpiTable protocol
+  //
+  Status = gBS->LocateProtocol (
+                  &gEfiAcpiSdtProtocolGuid,
+                  NULL,
+                  (VOID **)&AcpiTableProtocol
+                  );
+  if (EFI_ERROR (Status)) {
+    DEBUG ((DEBUG_ERROR, "Unable to locate ACPI table protocol\n"));
+    return;
+  }
+
+  mPrivateData->AcpiTableProtocol = AcpiTableProtocol;
+
+  Status = AcpiOpenDSDT (AcpiTableProtocol, &TableHandle);
+  if (EFI_ERROR (Status)) {
+    DEBUG ((DEBUG_ERROR, "Unable to locate DSDT table protocol\n"));
+    return;
+  }
+
+  mPrivateData->AcpiTableHandle = TableHandle;
+
+  Status = UpdateCPPCConfig (mPrivateData);
+  if (EFI_ERROR (Status)) {
+    return;
+  }
+
+  Status = UpdateLPIConfig (mPrivateData);
+  if (EFI_ERROR (Status)) {
+    return;
+  }
+
+  Status = UpdateTurboModeConfig (mPrivateData);
+  if (EFI_ERROR (Status)) {
+    return;
+  }
+
+  //
+  // Close DSDT Table
+  //
+  AcpiTableProtocol->Close (TableHandle);
+
+  AcpiDSDTUpdateChecksum (AcpiTableProtocol);
+}
+
+STATIC
+EFI_STATUS
+AcpiConfigUnload (
+  VOID
+  )
+{
+  ASSERT (mPrivateData != NULL);
+
+  if (mDriverHandle != NULL) {
+    gBS->UninstallMultipleProtocolInterfaces (
+           mDriverHandle,
+           &gEfiDevicePathProtocolGuid,
+           &mAcpiConfigHiiVendorDevicePath,
+           &gEfiHiiConfigAccessProtocolGuid,
+           &mPrivateData->ConfigAccess,
+           NULL
+           );
+    mDriverHandle = NULL;
+  }
+
+  if (mPrivateData->HiiHandle != NULL) {
+    HiiRemovePackages (mPrivateData->HiiHandle);
+  }
+
+  FreePool (mPrivateData);
+  mPrivateData = NULL;
+
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+EFIAPI
+AcpiConfigEntryPoint (
+  IN EFI_HANDLE       ImageHandle,
+  IN EFI_SYSTEM_TABLE *SystemTable
+  )
+{
+  EFI_STATUS                      Status;
+  EFI_HII_HANDLE                  HiiHandle;
+  EFI_HII_CONFIG_ROUTING_PROTOCOL *HiiConfigRouting;
+  UINTN                           BufferSize;
+  ACPI_CONFIG_VARSTORE_DATA       *Configuration;
+  BOOLEAN                         ActionFlag;
+  EFI_STRING                      ConfigRequestHdr;
+  EFI_EVENT                       ReadyToBootEvent;
+  PLATFORM_INFO_HOB               *PlatformHob;
+  VOID                            *Hob;
+
+  //
+  // Initialize the local variables.
+  //
+  ConfigRequestHdr = NULL;
+
+  //
+  // Initialize driver private data
+  //
+  mPrivateData = AllocateZeroPool (sizeof (ACPI_CONFIG_PRIVATE_DATA));
+  if (mPrivateData == NULL) {
+    return EFI_OUT_OF_RESOURCES;
+  }
+
+  mPrivateData->Signature = ACPI_CONFIG_PRIVATE_SIGNATURE;
+
+  mPrivateData->ConfigAccess.ExtractConfig = ExtractConfig;
+  mPrivateData->ConfigAccess.RouteConfig = RouteConfig;
+  mPrivateData->ConfigAccess.Callback = DriverCallback;
+
+  //
+  // Get the Platform HOB
+  //
+  Hob = GetFirstGuidHob (&gPlatformHobGuid);
+  ASSERT (Hob != NULL);
+  if (Hob == NULL) {
+    AcpiConfigUnload ();
+    return EFI_DEVICE_ERROR;
+  }
+  PlatformHob = (PLATFORM_INFO_HOB *)GET_GUID_HOB_DATA (Hob);
+
+  mPrivateData->PlatformHob = PlatformHob;
+
+  //
+  // Locate ConfigRouting protocol
+  //
+  Status = gBS->LocateProtocol (&gEfiHiiConfigRoutingProtocolGuid, NULL, (VOID **)&HiiConfigRouting);
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+  mPrivateData->HiiConfigRouting = HiiConfigRouting;
+
+  Status = gBS->InstallMultipleProtocolInterfaces (
+                  &mDriverHandle,
+                  &gEfiDevicePathProtocolGuid,
+                  &mAcpiConfigHiiVendorDevicePath,
+                  &gEfiHiiConfigAccessProtocolGuid,
+                  &mPrivateData->ConfigAccess,
+                  NULL
+                  );
+  ASSERT_EFI_ERROR (Status);
+
+  mPrivateData->DriverHandle = mDriverHandle;
+
+  //
+  // Publish our HII data
+  //
+  HiiHandle = HiiAddPackages (
+                &gAcpiConfigFormSetGuid,
+                mDriverHandle,
+                AcpiConfigDxeStrings,
+                VfrBin,
+                NULL
+                );
+  if (HiiHandle == NULL) {
+    gBS->UninstallMultipleProtocolInterfaces (
+           mDriverHandle,
+           &gEfiDevicePathProtocolGuid,
+           &mAcpiConfigHiiVendorDevicePath,
+           &gEfiHiiConfigAccessProtocolGuid,
+           &mPrivateData->ConfigAccess,
+           NULL
+           );
+    return EFI_OUT_OF_RESOURCES;
+  }
+
+  mPrivateData->HiiHandle = HiiHandle;
+
+  //
+  // Initialize configuration data
+  //
+  Configuration = &mPrivateData->Configuration;
+  ZeroMem (Configuration, sizeof (ACPI_CONFIG_VARSTORE_DATA));
+
+  //
+  // Try to read NV config EFI variable first
+  //
+  ConfigRequestHdr = HiiConstructConfigHdr (&gAcpiConfigFormSetGuid, AcpiVarstoreDataName, mDriverHandle);
+  ASSERT (ConfigRequestHdr != NULL);
+
+  BufferSize = sizeof (ACPI_CONFIG_VARSTORE_DATA);
+  Status = gRT->GetVariable (AcpiVarstoreDataName, &gAcpiConfigFormSetGuid, NULL, &BufferSize, Configuration);
+  if (EFI_ERROR (Status)) {
+    //
+    // Store zero data Buffer Storage to EFI variable
+    //
+    Status = gRT->SetVariable (
+                    AcpiVarstoreDataName,
+                    &gAcpiConfigFormSetGuid,
+                    ACPI_VARSTORE_ATTRIBUTES,
+                    sizeof (ACPI_CONFIG_VARSTORE_DATA),
+                    Configuration
+                    );
+    if (EFI_ERROR (Status)) {
+      AcpiConfigUnload ();
+      return Status;
+    }
+    //
+    // EFI variable for NV config doesn't exit, we should build this variable
+    // based on default values stored in IFR
+    //
+    ActionFlag = HiiSetToDefaults (ConfigRequestHdr, EFI_HII_DEFAULT_CLASS_STANDARD);
+    if (!ActionFlag) {
+      AcpiConfigUnload ();
+      return EFI_INVALID_PARAMETER;
+    }
+  } else {
+    //
+    // EFI variable does exist and Validate Current Setting
+    //
+    ActionFlag = HiiValidateSettings (ConfigRequestHdr);
+    if (!ActionFlag) {
+      AcpiConfigUnload ();
+      return EFI_INVALID_PARAMETER;
+    }
+  }
+  FreePool (ConfigRequestHdr);
+
+  Status = gBS->CreateEventEx (
+                  EVT_NOTIFY_SIGNAL,
+                  TPL_NOTIFY,
+                  UpdateAcpiOnReadyToBoot,
+                  NULL,
+                  &gEfiEventReadyToBootGuid,
+                  &ReadyToBootEvent
+                  );
+  if (EFI_ERROR (Status)) {
+    DEBUG ((DEBUG_ERROR, "Fail to create ready to boot event %r!\n", Status));
+    return Status;
+  }
+
+  Status = AcpiNVDataUpdate (mPrivateData);
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+
+  return EFI_SUCCESS;
+}
diff --git a/Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/VfrStrings.uni b/Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/VfrStrings.uni
new file mode 100644
index 000000000000..21a6188518fd
--- /dev/null
+++ b/Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/VfrStrings.uni
@@ -0,0 +1,27 @@
+//
+// Copyright (c) 2020 - 2021, Ampere Computing LLC. All rights reserved.<BR>
+//
+// SPDX-License-Identifier: BSD-2-Clause-Patent
+//
+
+#langdef en-US  "English"
+
+#string STR_ACPI_FORM                                #language en-US "ACPI Configuration"
+#string STR_ACPI_FORM_HELP                           #language en-US "ACPI Configuration"
+
+#string STR_ACPI_FORM_SEPERATE_LINE                  #language en-US ""
+#string STR_ACPI_COMMON_ENABLE                       #language en-US "Enabled"
+#string STR_ACPI_COMMON_DISABLE                      #language en-US "Disabled"
+#string STR_ACPI_UNSUPPORTED                         #language en-US "Unsupported"
+
+#string STR_ACPI_APEI_SUPPORT_PROMPT                 #language en-US "APEI Support"
+#string STR_ACPI_APEI_SUPPORT_HELP                   #language en-US "Enable/Disable ACPI Platform Error Interface support"
+
+#string STR_ACPI_CPPC_PROMPT                         #language en-US "CPPC Support"
+#string STR_ACPI_CPPC_HELP                           #language en-US "Enables or Disables System ability to CPPC (Collaborative Processor Performance Control)"
+
+#string STR_ACPI_LPI_PROMPT                          #language en-US "LPI Support"
+#string STR_ACPI_LPI_HELP                            #language en-US "Enables or Disables System ability to LPI (Lower Power Idle)"
+
+#string STR_ACPI_TURBO_PROMPT                        #language en-US "Max Performance"
+#string STR_ACPI_TURBO_HELP                          #language en-US "Enables or Disables System ability to Max Performance"
-- 
2.17.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#75634): https://edk2.groups.io/g/devel/message/75634
Mute This Topic: https://groups.io/mt/83097150/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-


Re: [edk2-devel] [edk2-platforms][PATCH v2 25/32] AmpereAltraPkg: Add configuration screen for ACPI
Posted by Leif Lindholm 4 years, 8 months ago
On Wed, May 26, 2021 at 17:07:17 +0700, Nhi Pham wrote:
> This supports:
> * Enable/Disable APEI Support
> * Enable/Disable CPPC Support
> * Enable/Disable LPI support
> * Enable/Disable Max Performance Mode
> 
> Cc: Thang Nguyen <thang@os.amperecomputing.com>
> Cc: Chuong Tran <chuong@os.amperecomputing.com>
> Cc: Phong Vo <phong@os.amperecomputing.com>
> Cc: Leif Lindholm <leif@nuviainc.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> 
> Signed-off-by: Nhi Pham <nhi@os.amperecomputing.com>
> ---
>  Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dec                      |   3 +
>  Platform/Ampere/JadePkg/Jade.dsc                                      |   1 +
>  Platform/Ampere/JadePkg/Jade.fdf                                      |   1 +
>  Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf   |   1 +
>  Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/AcpiConfigDxe.inf |  56 ++
>  Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiApei.h            |   2 +
>  Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/AcpiConfigDxe.h   |  85 +++
>  Silicon/Ampere/AmpereAltraPkg/Include/AcpiNVDataStruc.h               |  28 +
>  Silicon/Ampere/AmpereAltraPkg/Include/Guid/AcpiConfigFormSet.h        |  19 +
>  Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/Vfr.vfr           |  69 ++
>  Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiApei.c            |  23 +-
>  Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/AcpiConfigDxe.c   | 733 ++++++++++++++++++++
>  Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/VfrStrings.uni    |  27 +
>  13 files changed, 1046 insertions(+), 2 deletions(-)
> 
> diff --git a/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dec b/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dec
> index 05b4e8576836..ede85d3a3421 100644
> --- a/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dec
> +++ b/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dec
> @@ -53,6 +53,9 @@ [Guids]
>    # GUID for the CPU HII configuration form
>    gCpuConfigFormSetGuid        = { 0x43FAA144, 0xA2DF, 0x4050, { 0xA7, 0xFD, 0xEE, 0x17, 0xC9, 0xB8, 0x88, 0x8E } }
>  
> +  # GUID for the ACPI HII configuration form
> +  gAcpiConfigFormSetGuid = { 0x0ceb6764, 0xd415, 0x4b01, { 0xa8, 0x43, 0xd1, 0x01, 0xbc, 0xb0, 0xd8, 0x29 } }
> +
>    ## 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 547fbb68b4e3..e82b0cce691a 100755
> --- a/Platform/Ampere/JadePkg/Jade.dsc
> +++ b/Platform/Ampere/JadePkg/Jade.dsc
> @@ -181,3 +181,4 @@ [Components.common]
>    Silicon/Ampere/AmpereAltraPkg/Drivers/PlatformInfoDxe/PlatformInfoDxe.inf
>    Silicon/Ampere/AmpereAltraPkg/Drivers/MemInfoDxe/MemInfoDxe.inf
>    Silicon/Ampere/AmpereAltraPkg/Drivers/CpuConfigDxe/CpuConfigDxe.inf
> +  Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/AcpiConfigDxe.inf
> diff --git a/Platform/Ampere/JadePkg/Jade.fdf b/Platform/Ampere/JadePkg/Jade.fdf
> index b8342fde9d72..ddd601075f19 100755
> --- a/Platform/Ampere/JadePkg/Jade.fdf
> +++ b/Platform/Ampere/JadePkg/Jade.fdf
> @@ -356,5 +356,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
> +  INF Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/AcpiConfigDxe.inf
>  
>  !include Platform/Ampere/AmperePlatformPkg/FvRules.fdf.inc
> diff --git a/Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf b/Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf
> index a1a323eee472..287b4eadbf4a 100644
> --- a/Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf
> +++ b/Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf
> @@ -64,6 +64,7 @@ [Guids]
>    gArmMpCoreInfoGuid
>    gEfiAcpiTableGuid
>    gEfiEventReadyToBootGuid
> +  gAcpiConfigFormSetGuid
>    gPlatformHobGuid
>  
>  [Protocols]
> diff --git a/Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/AcpiConfigDxe.inf b/Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/AcpiConfigDxe.inf
> new file mode 100644
> index 000000000000..bc2fbebc84d1
> --- /dev/null
> +++ b/Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/AcpiConfigDxe.inf
> @@ -0,0 +1,56 @@
> +## @file
> +#
> +# Copyright (c) 2020 - 2021, Ampere Computing LLC. All rights reserved.<BR>
> +#
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> +#
> +##
> +
> +[Defines]
> +  INF_VERSION                    = 0x0001001B
> +  BASE_NAME                      = AcpiConfigDxe
> +  FILE_GUID                      = F36685AE-2623-4231-ABC0-2C151451E6B7
> +  MODULE_TYPE                    = DXE_DRIVER
> +  VERSION_STRING                 = 1.0
> +  ENTRY_POINT                    = AcpiConfigEntryPoint
> +
> +[Sources.common]
> +  AcpiConfigDxe.c
> +  AcpiConfigDxe.h
> +  Vfr.vfr
> +  VfrStrings.uni
> +
> +[Packages]
> +  MdeModulePkg/MdeModulePkg.dec
> +  MdePkg/MdePkg.dec
> +  Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dec
> +  Silicon/Ampere/AmpereSiliconPkg/AmpereSiliconPkg.dec
> +
> +[LibraryClasses]
> +  AcpiHelperLib
> +  BaseLib
> +  BaseMemoryLib
> +  DebugLib
> +  DevicePathLib
> +  HiiLib
> +  HobLib
> +  MemoryAllocationLib
> +  SystemFirmwareInterfaceLib
> +  UefiBootServicesTableLib
> +  UefiDriverEntryPoint
> +  UefiLib
> +
> +[Guids]
> +  gPlatformManagerFormsetGuid
> +  gAcpiConfigFormSetGuid
> +  gEfiEventReadyToBootGuid
> +  gPlatformHobGuid
> +
> +[Protocols]
> +  gEfiDevicePathProtocolGuid                    ## CONSUMES
> +  gEfiHiiConfigRoutingProtocolGuid              ## CONSUMES
> +  gEfiHiiConfigAccessProtocolGuid               ## PRODUCES
> +
> +[Depex]
> +  gEfiVariableArchProtocolGuid AND
> +  gEfiVariableWriteArchProtocolGuid
> diff --git a/Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiApei.h b/Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiApei.h
> index c207142459ad..5a0ce9dcc69a 100644
> --- a/Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiApei.h
> +++ b/Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiApei.h
> @@ -9,7 +9,9 @@
>  #ifndef ACPI_APEI_H_
>  #define ACPI_APEI_H_
>  
> +#include <AcpiNVDataStruc.h>
>  #include <Base.h>
> +#include <Guid/AcpiConfigFormSet.h>
>  #include <IndustryStandard/Acpi63.h>
>  #include <Library/AcpiHelperLib.h>
>  #include <Library/AmpereCpuLib.h>
> diff --git a/Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/AcpiConfigDxe.h b/Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/AcpiConfigDxe.h
> new file mode 100644
> index 000000000000..45cb08e01f7b
> --- /dev/null
> +++ b/Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/AcpiConfigDxe.h
> @@ -0,0 +1,85 @@
> +/** @file
> +
> +  Copyright (c) 2020 - 2021, Ampere Computing LLC. All rights reserved.<BR>
> +
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
> +
> +**/
> +
> +#ifndef DRIVER_SAMPLE_H_
> +#define DRIVER_SAMPLE_H_

*Cough*

> +
> +#include <Uefi.h>
> +
> +#include <AcpiNVDataStruc.h>
> +#include <Guid/AcpiConfigFormSet.h>
> +#include <Guid/MdeModuleHii.h>
> +#include <Guid/PlatformInfoHobGuid.h>
> +#include <Library/AcpiHelperLib.h>
> +#include <Library/AcpiHelperLib.h>
> +#include <Library/BaseLib.h>
> +#include <Library/BaseMemoryLib.h>
> +#include <Library/DebugLib.h>
> +#include <Library/DevicePathLib.h>
> +#include <Library/HiiLib.h>
> +#include <Library/HobLib.h>
> +#include <Library/MemoryAllocationLib.h>
> +#include <Library/SystemFirmwareInterfaceLib.h>
> +#include <Library/PrintLib.h>
> +#include <Library/UefiBootServicesTableLib.h>
> +#include <Library/UefiDriverEntryPoint.h>
> +#include <Library/UefiLib.h>
> +#include <Library/UefiRuntimeServicesTableLib.h>
> +#include <PlatformInfoHob.h>
> +#include <Protocol/AcpiSystemDescriptionTable.h>
> +#include <Protocol/HiiConfigAccess.h>
> +#include <Protocol/HiiConfigRouting.h>

Please move all include statements not actually used by this .h file
to the .c files that need them.

> +
> +//
> +// This is the generated IFR binary data for each formset defined in VFR.
> +//
> +extern UINT8 VfrBin[];

PlatformAcpiConfigVfrBin?

> +
> +//
> +// This is the generated String package data for all .UNI files.
> +//
> +extern UINT8 AcpiConfigDxeStrings[];
> +
> +#define ACPI_CONFIG_PRIVATE_SIGNATURE SIGNATURE_32 ('A', 'C', 'P', 'I')

This signature should be something kind of possible to be unique.

As pointed out for the PCIE config menu - there are a lot of things in
here that look like they form part of the ACPI global symbol/macro
namespace. It would be better if this could be avoided.

/
    Leif

> +
> +typedef struct {
> +  UINTN Signature;
> +
> +  EFI_HANDLE                DriverHandle;
> +  EFI_HII_HANDLE            HiiHandle;
> +  ACPI_CONFIG_VARSTORE_DATA Configuration;
> +  PLATFORM_INFO_HOB         *PlatformHob;
> +  EFI_ACPI_SDT_PROTOCOL     *AcpiTableProtocol;
> +  EFI_ACPI_HANDLE           AcpiTableHandle;
> +
> +  //
> +  // Consumed protocol
> +  //
> +  EFI_HII_CONFIG_ROUTING_PROTOCOL *HiiConfigRouting;
> +
> +  //
> +  // Produced protocol
> +  //
> +  EFI_HII_CONFIG_ACCESS_PROTOCOL ConfigAccess;
> +} ACPI_CONFIG_PRIVATE_DATA;
> +
> +#define ACPI_CONFIG_PRIVATE_FROM_THIS(a)  CR (a, ACPI_CONFIG_PRIVATE_DATA, ConfigAccess, ACPI_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
> diff --git a/Silicon/Ampere/AmpereAltraPkg/Include/AcpiNVDataStruc.h b/Silicon/Ampere/AmpereAltraPkg/Include/AcpiNVDataStruc.h
> new file mode 100644
> index 000000000000..17f80113797d
> --- /dev/null
> +++ b/Silicon/Ampere/AmpereAltraPkg/Include/AcpiNVDataStruc.h
> @@ -0,0 +1,28 @@
> +/** @file
> +
> +  Copyright (c) 2020 - 2021, Ampere Computing LLC. All rights reserved.<BR>
> +
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
> +
> +**/
> +
> +#ifndef ACPI_NV_DATA_STRUC_H_
> +#define ACPI_NV_DATA_STRUC_H_
> +
> +#pragma pack(1)
> +
> +//
> +// ACPI Configuration NV data structure definition
> +//
> +typedef struct {
> +  UINT32 EnableApeiSupport;
> +  UINT32 AcpiCppcEnable;
> +  UINT32 AcpiLpiEnable;
> +  UINT32 AcpiTurboSupport;
> +  UINT32 AcpiTurboMode;
> +  UINT32 Reserved[4];
> +} ACPI_CONFIG_VARSTORE_DATA;
> +
> +#pragma pack()
> +
> +#endif /* ACPI_NV_DATA_STRUC_H_ */
> diff --git a/Silicon/Ampere/AmpereAltraPkg/Include/Guid/AcpiConfigFormSet.h b/Silicon/Ampere/AmpereAltraPkg/Include/Guid/AcpiConfigFormSet.h
> new file mode 100644
> index 000000000000..1779a4543769
> --- /dev/null
> +++ b/Silicon/Ampere/AmpereAltraPkg/Include/Guid/AcpiConfigFormSet.h
> @@ -0,0 +1,19 @@
> +/** @file
> +
> +  Copyright (c) 2020 - 2021, Ampere Computing LLC. All rights reserved.<BR>
> +
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
> +
> +**/
> +
> +#ifndef ACPI_CONFIG_FORMSET_GUID_H_
> +#define ACPI_CONFIG_FORMSET_GUID_H_
> +
> +#define ACPI_CONFIGURATION_FORMSET_GUID \
> +  { \
> +    0x0ceb6764, 0xd415, 0x4b01, { 0xa8, 0x43, 0xd1, 0x01, 0xbc, 0xb0, 0xd8, 0x29 } \
> +  }
> +
> +extern EFI_GUID gAcpiConfigFormSetGuid;
> +
> +#endif /* ACPI_CONFIG_FORMSET_GUID_H_ */
> diff --git a/Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/Vfr.vfr b/Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/Vfr.vfr
> new file mode 100644
> index 000000000000..6cbd896987b5
> --- /dev/null
> +++ b/Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/Vfr.vfr
> @@ -0,0 +1,69 @@
> +/** @file
> +
> +  Copyright (c) 2020 - 2021, Ampere Computing LLC. All rights reserved.<BR>
> +
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
> +
> +**/
> +
> +
> +#include <Guid/AcpiConfigFormSet.h>
> +#include <AcpiNVDataStruc.h>
> +
> +#define ACPI_CONFIG_FORM_ID  1
> +
> +formset
> +  guid      = ACPI_CONFIGURATION_FORMSET_GUID,
> +  title     = STRING_TOKEN(STR_ACPI_FORM),
> +  help      = STRING_TOKEN(STR_ACPI_FORM_HELP),
> +  classguid = gPlatformManagerFormsetGuid,
> +
> +  varstore ACPI_CONFIG_VARSTORE_DATA,
> +    name  = AcpiConfigNVData,
> +    guid  = ACPI_CONFIGURATION_FORMSET_GUID;
> +
> +  form
> +    formid = ACPI_CONFIG_FORM_ID,
> +    title  = STRING_TOKEN(STR_ACPI_FORM);
> +    subtitle text = STRING_TOKEN(STR_ACPI_FORM_HELP);
> +
> +    oneof
> +      varid   = AcpiConfigNVData.EnableApeiSupport,
> +      prompt  = STRING_TOKEN(STR_ACPI_APEI_SUPPORT_PROMPT),
> +      help    = STRING_TOKEN(STR_ACPI_APEI_SUPPORT_HELP),
> +      option text = STRING_TOKEN(STR_ACPI_COMMON_DISABLE), value = 0, flags = 0;
> +      option text = STRING_TOKEN(STR_ACPI_COMMON_ENABLE), value = 1, flags = DEFAULT;
> +    endoneof;
> +
> +    oneof
> +      varid   = AcpiConfigNVData.AcpiCppcEnable,
> +      prompt  = STRING_TOKEN(STR_ACPI_CPPC_PROMPT),
> +      help    = STRING_TOKEN(STR_ACPI_CPPC_HELP),
> +      option text = STRING_TOKEN(STR_ACPI_COMMON_DISABLE), value = 0, flags = 0;
> +      option text = STRING_TOKEN(STR_ACPI_COMMON_ENABLE), value = 1, flags = DEFAULT;
> +    endoneof;
> +
> +    oneof
> +      varid   = AcpiConfigNVData.AcpiLpiEnable,
> +      prompt  = STRING_TOKEN(STR_ACPI_LPI_PROMPT),
> +      help    = STRING_TOKEN(STR_ACPI_LPI_HELP),
> +      option text = STRING_TOKEN(STR_ACPI_COMMON_DISABLE), value = 0, flags = 0;
> +      option text = STRING_TOKEN(STR_ACPI_COMMON_ENABLE), value = 1, flags = DEFAULT;
> +    endoneof;
> +
> +    grayoutif ideqval AcpiConfigNVData.AcpiTurboSupport == 0;
> +      oneof
> +        varid   = AcpiConfigNVData.AcpiTurboMode,
> +        prompt  = STRING_TOKEN(STR_ACPI_TURBO_PROMPT),
> +        help    = STRING_TOKEN(STR_ACPI_TURBO_HELP),
> +        option text = STRING_TOKEN(STR_ACPI_COMMON_ENABLE), value = 1, flags = DEFAULT;
> +        option text = STRING_TOKEN(STR_ACPI_COMMON_DISABLE), value = 0, flags = 0;
> +        suppressif ideqval AcpiConfigNVData.AcpiTurboSupport > 0;
> +        option text = STRING_TOKEN(STR_ACPI_UNSUPPORTED), value = 2, flags = 0;
> +        endif;
> +      endoneof;
> +    endif;
> +
> +  endform;
> +
> +endformset;
> diff --git a/Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiApei.c b/Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiApei.c
> index fa188c7776db..3ec63250a5de 100644
> --- a/Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiApei.c
> +++ b/Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiApei.c
> @@ -445,8 +445,27 @@ AcpiApeiUpdate (
>    VOID
>    )
>  {
> -  if (!IsSlaveSocketActive ()) {
> -    AcpiApeiHestUpdateTable1P ();
> +  EFI_STATUS                Status;
> +  ACPI_CONFIG_VARSTORE_DATA AcpiConfigData;
> +  UINTN                     BufferSize;
> +
> +  BufferSize = sizeof (ACPI_CONFIG_VARSTORE_DATA);
> +  Status = gRT->GetVariable (
> +                  L"AcpiConfigNVData",
> +                  &gAcpiConfigFormSetGuid,
> +                  NULL,
> +                  &BufferSize,
> +                  &AcpiConfigData
> +                  );
> +  if (!EFI_ERROR (Status) && (AcpiConfigData.EnableApeiSupport == 0)) {
> +    AcpiApeiUninstallTable (EFI_ACPI_6_3_BOOT_ERROR_RECORD_TABLE_SIGNATURE);
> +    AcpiApeiUninstallTable (EFI_ACPI_6_3_HARDWARE_ERROR_SOURCE_TABLE_SIGNATURE);
> +    AcpiApeiUninstallTable (EFI_ACPI_6_3_SOFTWARE_DELEGATED_EXCEPTIONS_INTERFACE_TABLE_SIGNATURE);
> +    AcpiApeiUninstallTable (EFI_ACPI_6_3_ERROR_INJECTION_TABLE_SIGNATURE);
> +  } else {
> +    if (!IsSlaveSocketActive ()) {
> +      AcpiApeiHestUpdateTable1P ();
> +    }
>    }
>  
>    if (!IsSdeiEnabled ()) {
> diff --git a/Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/AcpiConfigDxe.c b/Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/AcpiConfigDxe.c
> new file mode 100644
> index 000000000000..ea9004ef2e3c
> --- /dev/null
> +++ b/Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/AcpiConfigDxe.c
> @@ -0,0 +1,733 @@
> +/** @file
> +
> +  Copyright (c) 2020 - 2021, Ampere Computing LLC. All rights reserved.<BR>
> +
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
> +
> +**/
> +
> +#include "AcpiConfigDxe.h"
> +
> +#define ACPI_VARSTORE_ATTRIBUTES EFI_VARIABLE_BOOTSERVICE_ACCESS | \
> +                                 EFI_VARIABLE_RUNTIME_ACCESS     | \
> +                                 EFI_VARIABLE_NON_VOLATILE
> +
> +CHAR16 AcpiVarstoreDataName[] = L"AcpiConfigNVData";
> +
> +EFI_HANDLE               mDriverHandle = NULL;
> +ACPI_CONFIG_PRIVATE_DATA *mPrivateData = NULL;
> +
> +HII_VENDOR_DEVICE_PATH mAcpiConfigHiiVendorDevicePath = {
> +  {
> +    {
> +      HARDWARE_DEVICE_PATH,
> +      HW_VENDOR_DP,
> +      {
> +        (UINT8)(sizeof (VENDOR_DEVICE_PATH)),
> +        (UINT8)((sizeof (VENDOR_DEVICE_PATH)) >> 8)
> +      }
> +    },
> +    ACPI_CONFIGURATION_FORMSET_GUID
> +  },
> +  {
> +    END_DEVICE_PATH_TYPE,
> +    END_ENTIRE_DEVICE_PATH_SUBTYPE,
> +    {
> +      (UINT8)(END_DEVICE_PATH_LENGTH),
> +      (UINT8)((END_DEVICE_PATH_LENGTH) >> 8)
> +    }
> +  }
> +};
> +
> +/**
> +  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
> +                                 <ConfigRequest> 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
> +                                 <ConfigAltResp> 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
> +ExtractConfig (
> +  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;
> +  ACPI_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, &gAcpiConfigFormSetGuid, AcpiVarstoreDataName)) {
> +    return EFI_NOT_FOUND;
> +  }
> +
> +  PrivateData = ACPI_CONFIG_PRIVATE_FROM_THIS (This);
> +  HiiConfigRouting = PrivateData->HiiConfigRouting;
> +
> +  //
> +  // Get Buffer Storage data from EFI variable.
> +  // Try to get the current setting from variable.
> +  //
> +  BufferSize = sizeof (ACPI_CONFIG_VARSTORE_DATA);
> +  Status = gRT->GetVariable (
> +                  AcpiVarstoreDataName,
> +                  &gAcpiConfigFormSetGuid,
> +                  NULL,
> +                  &BufferSize,
> +                  &PrivateData->Configuration
> +                  );
> +  if (EFI_ERROR (Status)) {
> +    return EFI_NOT_FOUND;
> +  }
> +
> +  //
> +  // Convert buffer data to <ConfigResp> by helper function BlockToConfig()
> +  //
> +  BufferSize = sizeof (ACPI_CONFIG_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 <ConfigHdr> template
> +    // followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator
> +    //
> +    ConfigRequestHdr = HiiConstructConfigHdr (
> +                         &gAcpiConfigFormSetGuid,
> +                         AcpiVarstoreDataName,
> +                         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 <ConfigResp> 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 <ConfigResp>
> +                                 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
> +RouteConfig (
> +  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL *This,
> +  IN  CONST EFI_STRING                     Configuration,
> +  OUT EFI_STRING                           *Progress
> +  )
> +{
> +  EFI_STATUS                      Status;
> +  UINTN                           BufferSize;
> +  ACPI_CONFIG_PRIVATE_DATA        *PrivateData;
> +  EFI_HII_CONFIG_ROUTING_PROTOCOL *HiiConfigRouting;
> +
> +  if (Configuration == NULL || Progress == NULL) {
> +    return EFI_INVALID_PARAMETER;
> +  }
> +
> +  PrivateData = ACPI_CONFIG_PRIVATE_FROM_THIS (This);
> +  HiiConfigRouting = PrivateData->HiiConfigRouting;
> +  *Progress = Configuration;
> +
> +  //
> +  // Check routing data in <ConfigHdr>.
> +  // Note: if only one Storage is used, then this checking could be skipped.
> +  //
> +  if (!HiiIsConfigHdrMatch (Configuration, &gAcpiConfigFormSetGuid, AcpiVarstoreDataName)) {
> +    return EFI_NOT_FOUND;
> +  }
> +
> +  //
> +  // Get Buffer Storage data from EFI variable
> +  //
> +  BufferSize = sizeof (ACPI_CONFIG_VARSTORE_DATA);
> +  Status = gRT->GetVariable (
> +                  AcpiVarstoreDataName,
> +                  &gAcpiConfigFormSetGuid,
> +                  NULL,
> +                  &BufferSize,
> +                  &PrivateData->Configuration
> +                  );
> +  if (EFI_ERROR (Status)) {
> +    return Status;
> +  }
> +
> +  //
> +  // Convert <ConfigResp> to buffer data by helper function ConfigToBlock()
> +  //
> +  BufferSize = sizeof (ACPI_CONFIG_VARSTORE_DATA);
> +  Status = HiiConfigRouting->ConfigToBlock (
> +                               HiiConfigRouting,
> +                               Configuration,
> +                               (UINT8 *)&PrivateData->Configuration,
> +                               &BufferSize,
> +                               Progress
> +                               );
> +  if (EFI_ERROR (Status)) {
> +    return Status;
> +  }
> +
> +  //
> +  // Store Buffer Storage back to EFI variable
> +  //
> +  Status = gRT->SetVariable (
> +                  AcpiVarstoreDataName,
> +                  &gAcpiConfigFormSetGuid,
> +                  ACPI_VARSTORE_ATTRIBUTES,
> +                  sizeof (ACPI_CONFIG_VARSTORE_DATA),
> +                  &PrivateData->Configuration
> +                  );
> +
> +  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
> +DriverCallback (
> +  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;
> +}
> +
> +STATIC
> +EFI_STATUS
> +AcpiNVDataUpdate (
> +  IN ACPI_CONFIG_PRIVATE_DATA *PrivateData
> +  )
> +{
> +  EFI_STATUS         Status;
> +  PLATFORM_INFO_HOB  *PlatformHob;
> +  UINT32             TurboSupport;
> +
> +  ASSERT (PrivateData != NULL);
> +
> +  PlatformHob = PrivateData->PlatformHob;
> +  TurboSupport = PlatformHob->TurboCapability[0] + PlatformHob->TurboCapability[1];
> +
> +  if (TurboSupport == 0) {
> +    PrivateData->Configuration.AcpiTurboMode = 2; // Unsupported mode
> +    PrivateData->Configuration.AcpiTurboSupport = 0;
> +  } else {
> +    PrivateData->Configuration.AcpiTurboSupport = 1;
> +  }
> +
> +  Status = gRT->SetVariable (
> +                  AcpiVarstoreDataName,
> +                  &gAcpiConfigFormSetGuid,
> +                  ACPI_VARSTORE_ATTRIBUTES,
> +                  sizeof (ACPI_CONFIG_VARSTORE_DATA),
> +                  &PrivateData->Configuration
> +                  );
> +  if (EFI_ERROR (Status)) {
> +    DEBUG ((DEBUG_ERROR, "%a %d gRT->SetVariable() failed \n", __FUNCTION__, __LINE__));
> +    return Status;
> +  }
> +
> +  return EFI_SUCCESS;
> +}
> +
> +STATIC
> +EFI_STATUS
> +UpdateTurboModeConfig (
> +  IN ACPI_CONFIG_PRIVATE_DATA *PrivateData
> +  )
> +{
> +  EFI_STATUS         Status;
> +  PLATFORM_INFO_HOB  *PlatformHob;
> +  BOOLEAN            EnableTurbo;
> +
> +  ASSERT (PrivateData != NULL);
> +
> +  if (PrivateData->Configuration.AcpiTurboSupport != 0) {
> +    PlatformHob = PrivateData->PlatformHob;
> +    EnableTurbo = (PrivateData->Configuration.AcpiTurboMode != 0) ? TRUE : FALSE;
> +
> +    if (PlatformHob->TurboCapability[0] != 0) {
> +      Status = MailboxMsgTurboConfig (0, EnableTurbo);
> +      if (EFI_ERROR (Status)) {
> +        return Status;
> +      }
> +    }
> +
> +    if (PlatformHob->TurboCapability[1] != 0) {
> +      Status = MailboxMsgTurboConfig (1, EnableTurbo);
> +      if (EFI_ERROR (Status)) {
> +        return Status;
> +      }
> +    }
> +  } else {
> +    DEBUG ((DEBUG_INFO, "%a: Turbo mode is unsupported! \n", __FUNCTION__));
> +  }
> +
> +  return EFI_SUCCESS;
> +}
> +
> +STATIC
> +EFI_STATUS
> +UpdateCPPCConfig (
> +  IN ACPI_CONFIG_PRIVATE_DATA *PrivateData
> +  )
> +{
> +  EFI_STATUS            Status;
> +  EFI_ACPI_HANDLE       ChildHandle;
> +  CHAR8                 Buffer[64];
> +  EFI_ACPI_DATA_TYPE    DataType;
> +  UINTN                 DataSize;
> +  UINT8                 *Data;
> +  EFI_ACPI_SDT_PROTOCOL *AcpiTableProtocol;
> +
> +  ASSERT (PrivateData != NULL);
> +
> +  AcpiTableProtocol = PrivateData->AcpiTableProtocol;
> +
> +  AsciiSPrint (Buffer, sizeof (Buffer), "\\_SB.CPCE");
> +  Status = AcpiTableProtocol->FindPath (
> +                                PrivateData->AcpiTableHandle,
> +                                (VOID *)Buffer,
> +                                &ChildHandle
> +                                );
> +  if (EFI_ERROR (Status)) {
> +    DEBUG ((DEBUG_ERROR, "Failed to find path CPCE\n"));
> +    AcpiTableProtocol->Close (PrivateData->AcpiTableHandle);
> +    return Status;
> +  }
> +
> +  Status = AcpiTableProtocol->GetOption (
> +                                ChildHandle,
> +                                2,
> +                                &DataType,
> +                                (VOID *)&Data,
> +                                &DataSize
> +                                );
> +  if (EFI_ERROR (Status)) {
> +    return Status;
> +  }
> +  Data[0] = PrivateData->Configuration.AcpiCppcEnable;
> +
> +  return EFI_SUCCESS;
> +}
> +
> +STATIC
> +EFI_STATUS
> +UpdateLPIConfig (
> +  IN ACPI_CONFIG_PRIVATE_DATA *PrivateData
> +  )
> +{
> +  EFI_STATUS            Status;
> +  EFI_ACPI_HANDLE       ChildHandle;
> +  CHAR8                 Buffer[64];
> +  EFI_ACPI_DATA_TYPE    DataType;
> +  UINTN                 DataSize;
> +  UINT8                 *Data;
> +  EFI_ACPI_SDT_PROTOCOL *AcpiTableProtocol;
> +
> +  ASSERT (PrivateData != NULL);
> +
> +  AcpiTableProtocol = PrivateData->AcpiTableProtocol;
> +
> +  AsciiSPrint (Buffer, sizeof (Buffer), "\\_SB.LPIE");
> +  Status = AcpiTableProtocol->FindPath (
> +                                PrivateData->AcpiTableHandle,
> +                                (VOID *)Buffer,
> +                                &ChildHandle
> +                                );
> +  if (EFI_ERROR (Status)) {
> +    DEBUG ((DEBUG_ERROR, "Fail to find path LPIE\n"));
> +    AcpiTableProtocol->Close (PrivateData->AcpiTableHandle);
> +    return Status;
> +  }
> +
> +  Status = AcpiTableProtocol->GetOption (
> +                                ChildHandle,
> +                                2,
> +                                &DataType,
> +                                (VOID *)&Data,
> +                                &DataSize
> +                                );
> +  if (EFI_ERROR (Status)) {
> +    return Status;
> +  }
> +  Data[0] = PrivateData->Configuration.AcpiLpiEnable;
> +
> +  return EFI_SUCCESS;
> +}
> +
> +STATIC
> +VOID
> +UpdateAcpiOnReadyToBoot (
> +  IN EFI_EVENT Event,
> +  IN VOID      *Context
> +  )
> +{
> +  EFI_STATUS            Status;
> +  EFI_ACPI_SDT_PROTOCOL *AcpiTableProtocol;
> +  EFI_ACPI_HANDLE       TableHandle;
> +
> +  ASSERT (mPrivateData != NULL);
> +
> +  //
> +  // Find the AcpiTable protocol
> +  //
> +  Status = gBS->LocateProtocol (
> +                  &gEfiAcpiSdtProtocolGuid,
> +                  NULL,
> +                  (VOID **)&AcpiTableProtocol
> +                  );
> +  if (EFI_ERROR (Status)) {
> +    DEBUG ((DEBUG_ERROR, "Unable to locate ACPI table protocol\n"));
> +    return;
> +  }
> +
> +  mPrivateData->AcpiTableProtocol = AcpiTableProtocol;
> +
> +  Status = AcpiOpenDSDT (AcpiTableProtocol, &TableHandle);
> +  if (EFI_ERROR (Status)) {
> +    DEBUG ((DEBUG_ERROR, "Unable to locate DSDT table protocol\n"));
> +    return;
> +  }
> +
> +  mPrivateData->AcpiTableHandle = TableHandle;
> +
> +  Status = UpdateCPPCConfig (mPrivateData);
> +  if (EFI_ERROR (Status)) {
> +    return;
> +  }
> +
> +  Status = UpdateLPIConfig (mPrivateData);
> +  if (EFI_ERROR (Status)) {
> +    return;
> +  }
> +
> +  Status = UpdateTurboModeConfig (mPrivateData);
> +  if (EFI_ERROR (Status)) {
> +    return;
> +  }
> +
> +  //
> +  // Close DSDT Table
> +  //
> +  AcpiTableProtocol->Close (TableHandle);
> +
> +  AcpiDSDTUpdateChecksum (AcpiTableProtocol);
> +}
> +
> +STATIC
> +EFI_STATUS
> +AcpiConfigUnload (
> +  VOID
> +  )
> +{
> +  ASSERT (mPrivateData != NULL);
> +
> +  if (mDriverHandle != NULL) {
> +    gBS->UninstallMultipleProtocolInterfaces (
> +           mDriverHandle,
> +           &gEfiDevicePathProtocolGuid,
> +           &mAcpiConfigHiiVendorDevicePath,
> +           &gEfiHiiConfigAccessProtocolGuid,
> +           &mPrivateData->ConfigAccess,
> +           NULL
> +           );
> +    mDriverHandle = NULL;
> +  }
> +
> +  if (mPrivateData->HiiHandle != NULL) {
> +    HiiRemovePackages (mPrivateData->HiiHandle);
> +  }
> +
> +  FreePool (mPrivateData);
> +  mPrivateData = NULL;
> +
> +  return EFI_SUCCESS;
> +}
> +
> +EFI_STATUS
> +EFIAPI
> +AcpiConfigEntryPoint (
> +  IN EFI_HANDLE       ImageHandle,
> +  IN EFI_SYSTEM_TABLE *SystemTable
> +  )
> +{
> +  EFI_STATUS                      Status;
> +  EFI_HII_HANDLE                  HiiHandle;
> +  EFI_HII_CONFIG_ROUTING_PROTOCOL *HiiConfigRouting;
> +  UINTN                           BufferSize;
> +  ACPI_CONFIG_VARSTORE_DATA       *Configuration;
> +  BOOLEAN                         ActionFlag;
> +  EFI_STRING                      ConfigRequestHdr;
> +  EFI_EVENT                       ReadyToBootEvent;
> +  PLATFORM_INFO_HOB               *PlatformHob;
> +  VOID                            *Hob;
> +
> +  //
> +  // Initialize the local variables.
> +  //
> +  ConfigRequestHdr = NULL;
> +
> +  //
> +  // Initialize driver private data
> +  //
> +  mPrivateData = AllocateZeroPool (sizeof (ACPI_CONFIG_PRIVATE_DATA));
> +  if (mPrivateData == NULL) {
> +    return EFI_OUT_OF_RESOURCES;
> +  }
> +
> +  mPrivateData->Signature = ACPI_CONFIG_PRIVATE_SIGNATURE;
> +
> +  mPrivateData->ConfigAccess.ExtractConfig = ExtractConfig;
> +  mPrivateData->ConfigAccess.RouteConfig = RouteConfig;
> +  mPrivateData->ConfigAccess.Callback = DriverCallback;
> +
> +  //
> +  // Get the Platform HOB
> +  //
> +  Hob = GetFirstGuidHob (&gPlatformHobGuid);
> +  ASSERT (Hob != NULL);
> +  if (Hob == NULL) {
> +    AcpiConfigUnload ();
> +    return EFI_DEVICE_ERROR;
> +  }
> +  PlatformHob = (PLATFORM_INFO_HOB *)GET_GUID_HOB_DATA (Hob);
> +
> +  mPrivateData->PlatformHob = PlatformHob;
> +
> +  //
> +  // Locate ConfigRouting protocol
> +  //
> +  Status = gBS->LocateProtocol (&gEfiHiiConfigRoutingProtocolGuid, NULL, (VOID **)&HiiConfigRouting);
> +  if (EFI_ERROR (Status)) {
> +    return Status;
> +  }
> +  mPrivateData->HiiConfigRouting = HiiConfigRouting;
> +
> +  Status = gBS->InstallMultipleProtocolInterfaces (
> +                  &mDriverHandle,
> +                  &gEfiDevicePathProtocolGuid,
> +                  &mAcpiConfigHiiVendorDevicePath,
> +                  &gEfiHiiConfigAccessProtocolGuid,
> +                  &mPrivateData->ConfigAccess,
> +                  NULL
> +                  );
> +  ASSERT_EFI_ERROR (Status);
> +
> +  mPrivateData->DriverHandle = mDriverHandle;
> +
> +  //
> +  // Publish our HII data
> +  //
> +  HiiHandle = HiiAddPackages (
> +                &gAcpiConfigFormSetGuid,
> +                mDriverHandle,
> +                AcpiConfigDxeStrings,
> +                VfrBin,
> +                NULL
> +                );
> +  if (HiiHandle == NULL) {
> +    gBS->UninstallMultipleProtocolInterfaces (
> +           mDriverHandle,
> +           &gEfiDevicePathProtocolGuid,
> +           &mAcpiConfigHiiVendorDevicePath,
> +           &gEfiHiiConfigAccessProtocolGuid,
> +           &mPrivateData->ConfigAccess,
> +           NULL
> +           );
> +    return EFI_OUT_OF_RESOURCES;
> +  }
> +
> +  mPrivateData->HiiHandle = HiiHandle;
> +
> +  //
> +  // Initialize configuration data
> +  //
> +  Configuration = &mPrivateData->Configuration;
> +  ZeroMem (Configuration, sizeof (ACPI_CONFIG_VARSTORE_DATA));
> +
> +  //
> +  // Try to read NV config EFI variable first
> +  //
> +  ConfigRequestHdr = HiiConstructConfigHdr (&gAcpiConfigFormSetGuid, AcpiVarstoreDataName, mDriverHandle);
> +  ASSERT (ConfigRequestHdr != NULL);
> +
> +  BufferSize = sizeof (ACPI_CONFIG_VARSTORE_DATA);
> +  Status = gRT->GetVariable (AcpiVarstoreDataName, &gAcpiConfigFormSetGuid, NULL, &BufferSize, Configuration);
> +  if (EFI_ERROR (Status)) {
> +    //
> +    // Store zero data Buffer Storage to EFI variable
> +    //
> +    Status = gRT->SetVariable (
> +                    AcpiVarstoreDataName,
> +                    &gAcpiConfigFormSetGuid,
> +                    ACPI_VARSTORE_ATTRIBUTES,
> +                    sizeof (ACPI_CONFIG_VARSTORE_DATA),
> +                    Configuration
> +                    );
> +    if (EFI_ERROR (Status)) {
> +      AcpiConfigUnload ();
> +      return Status;
> +    }
> +    //
> +    // EFI variable for NV config doesn't exit, we should build this variable
> +    // based on default values stored in IFR
> +    //
> +    ActionFlag = HiiSetToDefaults (ConfigRequestHdr, EFI_HII_DEFAULT_CLASS_STANDARD);
> +    if (!ActionFlag) {
> +      AcpiConfigUnload ();
> +      return EFI_INVALID_PARAMETER;
> +    }
> +  } else {
> +    //
> +    // EFI variable does exist and Validate Current Setting
> +    //
> +    ActionFlag = HiiValidateSettings (ConfigRequestHdr);
> +    if (!ActionFlag) {
> +      AcpiConfigUnload ();
> +      return EFI_INVALID_PARAMETER;
> +    }
> +  }
> +  FreePool (ConfigRequestHdr);
> +
> +  Status = gBS->CreateEventEx (
> +                  EVT_NOTIFY_SIGNAL,
> +                  TPL_NOTIFY,
> +                  UpdateAcpiOnReadyToBoot,
> +                  NULL,
> +                  &gEfiEventReadyToBootGuid,
> +                  &ReadyToBootEvent
> +                  );
> +  if (EFI_ERROR (Status)) {
> +    DEBUG ((DEBUG_ERROR, "Fail to create ready to boot event %r!\n", Status));
> +    return Status;
> +  }
> +
> +  Status = AcpiNVDataUpdate (mPrivateData);
> +  if (EFI_ERROR (Status)) {
> +    return Status;
> +  }
> +
> +  return EFI_SUCCESS;
> +}
> diff --git a/Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/VfrStrings.uni b/Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/VfrStrings.uni
> new file mode 100644
> index 000000000000..21a6188518fd
> --- /dev/null
> +++ b/Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/VfrStrings.uni
> @@ -0,0 +1,27 @@
> +//
> +// Copyright (c) 2020 - 2021, Ampere Computing LLC. All rights reserved.<BR>
> +//
> +// SPDX-License-Identifier: BSD-2-Clause-Patent
> +//
> +
> +#langdef en-US  "English"
> +
> +#string STR_ACPI_FORM                                #language en-US "ACPI Configuration"
> +#string STR_ACPI_FORM_HELP                           #language en-US "ACPI Configuration"
> +
> +#string STR_ACPI_FORM_SEPERATE_LINE                  #language en-US ""
> +#string STR_ACPI_COMMON_ENABLE                       #language en-US "Enabled"
> +#string STR_ACPI_COMMON_DISABLE                      #language en-US "Disabled"
> +#string STR_ACPI_UNSUPPORTED                         #language en-US "Unsupported"
> +
> +#string STR_ACPI_APEI_SUPPORT_PROMPT                 #language en-US "APEI Support"
> +#string STR_ACPI_APEI_SUPPORT_HELP                   #language en-US "Enable/Disable ACPI Platform Error Interface support"
> +
> +#string STR_ACPI_CPPC_PROMPT                         #language en-US "CPPC Support"
> +#string STR_ACPI_CPPC_HELP                           #language en-US "Enables or Disables System ability to CPPC (Collaborative Processor Performance Control)"
> +
> +#string STR_ACPI_LPI_PROMPT                          #language en-US "LPI Support"
> +#string STR_ACPI_LPI_HELP                            #language en-US "Enables or Disables System ability to LPI (Lower Power Idle)"
> +
> +#string STR_ACPI_TURBO_PROMPT                        #language en-US "Max Performance"
> +#string STR_ACPI_TURBO_HELP                          #language en-US "Enables or Disables System ability to Max Performance"
> -- 
> 2.17.1
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#76161): https://edk2.groups.io/g/devel/message/76161
Mute This Topic: https://groups.io/mt/83097150/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-