[edk2-platforms PATCH v1 1/1] MinPlatformPkg/Acpi: MADT NMI default flag set to Edge-Triggered

[edk2-platforms PATCH v1 1/1] MinPlatformPkg/Acpi: MADT NMI default flag set to Edge-Triggered

[Sinha, Ankit]

1. Default APIC NMI structure in MADT changed to expose
   Level-Triggered interrupts.
2. x2APIC NMI structure won't be exposed to OS if x2APIC is not enabled.

Cc: Michael Kubacki <michael.a.kubacki@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Liming Gao <liming.gao@intel.com>

Signed-off-by: Ankit Sinha <ankit.sinha@intel.com>
---
 Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c | 52 ++++++++++----------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
index 5eb727929bfb..9c8e9f22e1ba 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
+++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
@@ -1049,7 +1049,7 @@ InstallMadtFromScratch (
   LocalApciNmiStruct.Type   = EFI_ACPI_4_0_LOCAL_APIC_NMI;
   LocalApciNmiStruct.Length = sizeof (EFI_ACPI_4_0_LOCAL_APIC_NMI_STRUCTURE);
   LocalApciNmiStruct.AcpiProcessorId = 0xFF;      // Applies to all processors
-  LocalApciNmiStruct.Flags           = 0x000D;    // Flags - Level-tiggered, Active High
+  LocalApciNmiStruct.Flags           = 0x0005;    // Flags - Edge-tiggered, Active High
   LocalApciNmiStruct.LocalApicLint   = 0x1;
 
   ASSERT (MadtStructsIndex < MaxMadtStructCount);
@@ -1066,24 +1066,26 @@ InstallMadtFromScratch (
   //
   // Build Local x2APIC NMI Structure
   //
-  LocalX2ApicNmiStruct.Type   = EFI_ACPI_4_0_LOCAL_X2APIC_NMI;
-  LocalX2ApicNmiStruct.Length = sizeof (EFI_ACPI_4_0_LOCAL_X2APIC_NMI_STRUCTURE);
-  LocalX2ApicNmiStruct.Flags  = 0x000D;                // Flags - Level-tiggered, Active High
-  LocalX2ApicNmiStruct.AcpiProcessorUid = 0xFFFFFFFF;  // Applies to all processors
-  LocalX2ApicNmiStruct.LocalX2ApicLint  = 0x01;
-  LocalX2ApicNmiStruct.Reserved[0] = 0x00;
-  LocalX2ApicNmiStruct.Reserved[1] = 0x00;
-  LocalX2ApicNmiStruct.Reserved[2] = 0x00;
+  if (mX2ApicEnabled) {
+    LocalX2ApicNmiStruct.Type   = EFI_ACPI_4_0_LOCAL_X2APIC_NMI;
+    LocalX2ApicNmiStruct.Length = sizeof (EFI_ACPI_4_0_LOCAL_X2APIC_NMI_STRUCTURE);
+    LocalX2ApicNmiStruct.Flags  = 0x000D;                // Flags - Level-tiggered, Active High
+    LocalX2ApicNmiStruct.AcpiProcessorUid = 0xFFFFFFFF;  // Applies to all processors
+    LocalX2ApicNmiStruct.LocalX2ApicLint  = 0x01;
+    LocalX2ApicNmiStruct.Reserved[0] = 0x00;
+    LocalX2ApicNmiStruct.Reserved[1] = 0x00;
+    LocalX2ApicNmiStruct.Reserved[2] = 0x00;
 
-  ASSERT (MadtStructsIndex < MaxMadtStructCount);
-  Status = CopyStructure (
-    &MadtTableHeader.Header,
-    (STRUCTURE_HEADER *) &LocalX2ApicNmiStruct,
-    &MadtStructs[MadtStructsIndex++]
-    );
-  if (EFI_ERROR (Status)) {
-    DEBUG ((EFI_D_ERROR, "CopyMadtStructure (x2APIC NMI) failed: %r\n", Status));
-    goto Done;
+    ASSERT (MadtStructsIndex < MaxMadtStructCount);
+    Status = CopyStructure (
+      &MadtTableHeader.Header,
+      (STRUCTURE_HEADER *) &LocalX2ApicNmiStruct,
+      &MadtStructs[MadtStructsIndex++]
+      );
+    if (EFI_ERROR (Status)) {
+      DEBUG ((DEBUG_ERROR, "CopyMadtStructure (x2APIC NMI) failed: %r\n", Status));
+      goto Done;
+    }
   }
 
   //
@@ -1167,7 +1169,7 @@ InstallMcfgFromScratch (
   //
   // Set MCFG table "Length" field based on the number of PCIe segments enumerated so far
   //
-  McfgTable->Header.Length = (UINT32)(sizeof (EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_HEADER) + 
+  McfgTable->Header.Length = (UINT32)(sizeof (EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_HEADER) +
                                       sizeof (EFI_ACPI_MEMORY_MAPPED_ENHANCED_CONFIGURATION_SPACE_BASE_ADDRESS_ALLOCATION_STRUCTURE) * SegmentCount);
 
   Segment = (VOID *)(McfgTable + 1);
@@ -1329,11 +1331,11 @@ PlatformUpdateTables (
     HpetCapabilities.Uint64  = HpetCapabilitiesData;
     HpetCapabilitiesData     = MmioRead32 (HpetBaseAddress + HPET_GENERAL_CAPABILITIES_ID_OFFSET + 4);
     HpetCapabilities.Uint64 |= LShiftU64 (HpetCapabilitiesData, 32);
-    HpetBlockId.Bits.Revision       = HpetCapabilities.Bits.Revision;
-    HpetBlockId.Bits.NumberOfTimers = HpetCapabilities.Bits.NumberOfTimers;
-    HpetBlockId.Bits.CounterSize    = HpetCapabilities.Bits.CounterSize;
-    HpetBlockId.Bits.Reserved       = 0;
-    HpetBlockId.Bits.LegacyRoute    = HpetCapabilities.Bits.LegacyRoute;
+    HpetBlockId.Bits.Revision       = HpetCapabilities.Bits.Revision;
+    HpetBlockId.Bits.NumberOfTimers = HpetCapabilities.Bits.NumberOfTimers;
+    HpetBlockId.Bits.CounterSize    = HpetCapabilities.Bits.CounterSize;
+    HpetBlockId.Bits.Reserved       = 0;
+    HpetBlockId.Bits.LegacyRoute    = HpetCapabilities.Bits.LegacyRoute;
     HpetBlockId.Bits.VendorId       = HpetCapabilities.Bits.VendorId;
     HpetTable->EventTimerBlockId    = HpetBlockId.Uint32;
     HpetTable->MainCounterMinimumClockTickInPeriodicMode = (UINT16)HpetCapabilities.Bits.CounterClockPeriod;
@@ -1459,7 +1461,7 @@ UpdateLocalTable (
 
   for (Index = 0; Index < sizeof(mLocalTable)/sizeof(mLocalTable[0]); Index++) {
     CurrentTable = mLocalTable[Index];
-  
+
     PlatformUpdateTables (CurrentTable, &Version);
 
     TableHandle = 0;
-- 
2.16.2.windows.1