FmpDevicePkg: Add package, library classes, and PCDs

[mirror_edk2.git] / Vlv2TbltDevicePkg / AcpiPlatform / AcpiPlatform.c

diff --git a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
index db1b5a5eeb554e57789fecdf05bf2a050bd20913..4a913eb723152b7fc89678a3758414fc251c1860 100644 (file)
--- a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
+++ b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
@@ -58,6 +58,7 @@ Abstract:
 #include <PchAccess.h>\r
 #include <Guid/Vlv2Variable.h>\r
 #include <Guid/PlatformCpuInfo.h>\r
+#include <IndustryStandard/WindowsSmmSecurityMitigationTable.h>\r
 \r
 \r
 CHAR16    EfiPlatformCpuInfoVariable[] = L"PlatformCpuInfo";\r
@@ -66,6 +67,7 @@ CHAR16    gACPIOSFRRefDataBlockVariableName[] = ACPI_OSFR_REF_DATA_BLOCK_VARIABL
 CHAR16    gACPIOSFRMfgStringVariableName[] = ACPI_OSFR_MFG_STRING_VARIABLE_NAME;\r
 \r
 EFI_CPU_IO_PROTOCOL                    *mCpuIo;\r
+EFI_GLOBAL_NVS_AREA_PROTOCOL            mGlobalNvsArea;\r
 #ifndef __GNUC__\r
 #pragma optimize("", off)\r
 #endif\r
@@ -210,8 +212,6 @@ PlatformUpdateTables (
   EFI_MP_SERVICES_PROTOCOL                                    *MpService;\r
   UINTN                                                       MaximumNumberOfCPUs;\r
   UINTN                                                       NumberOfEnabledCPUs;\r
-  UINTN                                                       BufferSize;\r
-  ACPI_APIC_STRUCTURE_PTR                                     *ProcessorLocalApicEntry;\r
   UINTN                                                       BspIndex;\r
   EFI_ACPI_1_0_ASF_DESCRIPTION_TABLE                          *AsfEntry;\r
   EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER            *HpetTbl;\r
@@ -233,18 +233,16 @@ PlatformUpdateTables (
   UINT16                                                      NumberOfHpets;\r
   UINT16                                                      HpetCapIdValue;\r
   UINT32                                                      HpetBlockID;\r
-  UINTN                                                       LocalApicCounter;\r
   EFI_PROCESSOR_INFORMATION                                   ProcessorInfoBuffer;\r
   UINT8                                                       TempVal;\r
   EFI_ACPI_3_0_IO_APIC_STRUCTURE                              *IOApicType;\r
   EFI_ACPI_3_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER         *APICTableHeader;\r
+  EFI_ACPI_WSMT_TABLE                                         *WsmtTable;\r
 \r
   CurrPtr                 = NULL;\r
   EndPtr                  = NULL;\r
   ApicPtr                 = NULL;\r
-  LocalApicCounter        = 0;\r
   CurrProcessor           = 0;\r
-  ProcessorLocalApicEntry = NULL;\r
 \r
 \r
  if (Table->Signature != EFI_ACPI_1_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE) {\r
@@ -372,7 +370,6 @@ PlatformUpdateTables (
               ApicPtr->AcpiLocalApic.AcpiProcessorId = (UINT8)MaximumNumberOfCPUs;\r
             }\r
 \r
-            BufferSize                    = 0;\r
             ApicPtr->AcpiLocalApic.Flags  = 0;\r
 \r
             for (CurrProcessor = 0; CurrProcessor < MaximumNumberOfCPUs; CurrProcessor++) {\r
@@ -599,6 +596,17 @@ PlatformUpdateTables (
       gBS->FreePool (OcurModelStringBuffer);\r
       gBS->FreePool (OcurRefDataBlockBuffer);\r
       break;\r
+\r
+\r
+    case EFI_ACPI_WINDOWS_SMM_SECURITY_MITIGATION_TABLE_SIGNATURE:\r
+      WsmtTable = (EFI_ACPI_WSMT_TABLE *) Table;\r
+       //\r
+       // Update Microsoft WSMT table Protections flags.\r
+       //\r
+      WsmtTable->ProtectionFlags = ((WsmtTable->ProtectionFlags) | (EFI_WSMT_PROTECTION_FLAGS_FIXED_COMM_BUFFERS | EFI_WSMT_PROTECTION_FLAGS_COMM_BUFFER_NESTED_PTR_PROTECTION ));\r
+      break;\r
+\r
+\r
     default:\r
       break;\r
   }\r
@@ -794,7 +802,6 @@ AcpiPlatformEntryPoint (
   EFI_MP_SERVICES_PROTOCOL      *MpService;\r
   UINTN                         MaximumNumberOfCPUs;\r
   UINTN                         NumberOfEnabledCPUs;\r
-  UINT32                        Data32;\r
   PCH_STEPPING                  pchStepping;\r
 \r
   mFirstNotify      = FALSE;\r
@@ -803,7 +810,6 @@ AcpiPlatformEntryPoint (
   Instance          = 0;\r
   CurrentTable      = NULL;\r
   TableHandle       = 0;\r
-  Data32            = 0;\r
 \r
   //\r
   // Update HOB variable for PCI resource information.\r