IntelSiliconPkg/Vtd: Add DMA_CTRL_PLATFORM_OPT_IN_FLAG dump

[mirror_edk2.git] / IntelSiliconPkg / Feature / VTd / IntelVTdDxe / DmarAcpiTable.c

diff --git a/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c b/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c
index ce350bafbe3ffdee176909d46a7626d9833e779c..24723fe4972aeb9eb0013288eb4bdc87843e06d4 100644 (file)
--- a/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c
+++ b/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
-  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -27,7 +27,7 @@ typedef struct {
 \r
 #pragma pack()\r
 \r
-EFI_ACPI_DMAR_HEADER  *mAcpiDmarTable;\r
+EFI_ACPI_DMAR_HEADER  *mAcpiDmarTable = NULL;\r
 \r
 /**\r
   Dump DMAR DeviceScopeEntry.\r
@@ -498,6 +498,10 @@ DumpAcpiDMAR (
     "      X2APIC_OPT_OUT_SET ................................. 0x%02x\n",\r
     Dmar->Flags & EFI_ACPI_DMAR_FLAGS_X2APIC_OPT_OUT\r
     ));\r
+  DEBUG ((DEBUG_INFO,\r
+    "      DMA_CTRL_PLATFORM_OPT_IN_FLAG ...................... 0x%02x\n",\r
+    Dmar->Flags & EFI_ACPI_DMAR_FLAGS_DMA_CTRL_PLATFORM_OPT_IN_FLAG\r
+    ));\r
 \r
   DmarLen  = Dmar->Header.Length - sizeof(EFI_ACPI_DMAR_HEADER);\r
   DmarHeader = (EFI_ACPI_DMAR_STRUCTURE_HEADER *)(Dmar + 1);\r
@@ -806,8 +810,6 @@ ParseDmarAcpiTableDrhd (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  mVtdHostAddressWidthMask = LShiftU64 (1ull, mAcpiDmarTable->HostAddressWidth) - 1;\r
-\r
   VtdIndex = 0;\r
   DmarHeader = (EFI_ACPI_DMAR_STRUCTURE_HEADER *)((UINTN)(mAcpiDmarTable + 1));\r
   while ((UINTN)DmarHeader < (UINTN)mAcpiDmarTable + mAcpiDmarTable->Header.Length) {\r
@@ -889,7 +891,7 @@ ScanTableInRSDT (
   EntryPtr = &Rsdt->Entry;\r
   for (Index = 0; Index < EntryCount; Index ++, EntryPtr ++) {\r
     Table = (EFI_ACPI_DESCRIPTION_HEADER*)((UINTN)(*EntryPtr));\r
-    if (Table->Signature == Signature) {\r
+    if ((Table != NULL) && (Table->Signature == Signature)) {\r
       return Table;\r
     }\r
   }\r
@@ -923,7 +925,7 @@ ScanTableInXSDT (
   for (Index = 0; Index < EntryCount; Index ++) {\r
     CopyMem (&EntryPtr, (VOID *)(BasePtr + Index * sizeof(UINT64)), sizeof(UINT64));\r
     Table = (EFI_ACPI_DESCRIPTION_HEADER*)((UINTN)(EntryPtr));\r
-    if (Table->Signature == Signature) {\r
+    if ((Table != NULL) && (Table->Signature == Signature)) {\r
       return Table;\r
     }\r
   }\r
@@ -1005,6 +1007,9 @@ GetDmarAcpiTable (
                &AcpiTable\r
                );\r
   }\r
+  if (EFI_ERROR (Status)) {\r
+    return EFI_NOT_FOUND;\r
+  }\r
   ASSERT (AcpiTable != NULL);\r
 \r
   mAcpiDmarTable = FindAcpiPtr (\r