From: Star Zeng <star.zeng@intel.com>
Date: Thu, 23 Nov 2017 00:55:02 +0000 (+0800)
Subject: IntelSiliconPkg IntelVTdDxe: Do not SetupVtd again
X-Git-Tag: edk2-stable201903~3044
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=7729e3c448a116eb5b6198f0f70355f421df43fa

IntelSiliconPkg IntelVTdDxe: Do not SetupVtd again

Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Star Zeng <star.zeng@intel.com>
Tested-by: Jiewen Yao <jiewen.yao@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
---

diff --git a/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmaProtection.c b/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmaProtection.c
index 6052a0aebe..37b3b19bce 100644
--- a/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmaProtection.c
+++ b/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmaProtection.c
@@ -412,6 +412,9 @@ AcpiNotificationFunc (
 
   Status = GetDmarAcpiTable ();
   if (EFI_ERROR (Status)) {
+    if (Status == EFI_ALREADY_STARTED) {
+      gBS->CloseEvent (Event);
+    }
     return;
   }
   SetupVtd ();
diff --git a/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmaProtection.h b/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmaProtection.h
index 0886647ea6..519a5ab004 100644
--- a/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmaProtection.h
+++ b/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmaProtection.h
@@ -302,8 +302,9 @@ FindVtdIndexByPciDevice (
 /**
   Get the DMAR ACPI table.
 
-  @retval EFI_SUCCESS    The DMAR ACPI table is got.
-  @retval EFI_NOT_FOUND  The DMAR ACPI table is not found.
+  @retval EFI_SUCCESS           The DMAR ACPI table is got.
+  @retval EFI_ALREADY_STARTED   The DMAR ACPI table has been got previously.
+  @retval EFI_NOT_FOUND         The DMAR ACPI table is not found.
 **/
 EFI_STATUS
 GetDmarAcpiTable (
diff --git a/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c b/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c
index 81dec10967..ce350bafbe 100644
--- a/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c
+++ b/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c
@@ -978,8 +978,9 @@ FindAcpiPtr (
 /**
   Get the DMAR ACPI table.
 
-  @retval EFI_SUCCESS    The DMAR ACPI table is got.
-  @retval EFI_NOT_FOUND  The DMAR ACPI table is not found.
+  @retval EFI_SUCCESS           The DMAR ACPI table is got.
+  @retval EFI_ALREADY_STARTED   The DMAR ACPI table has been got previously.
+  @retval EFI_NOT_FOUND         The DMAR ACPI table is not found.
 **/
 EFI_STATUS
 GetDmarAcpiTable (
@@ -990,7 +991,7 @@ GetDmarAcpiTable (
   EFI_STATUS                        Status;
 
   if (mAcpiDmarTable != NULL) {
-    return EFI_SUCCESS;
+    return EFI_ALREADY_STARTED;
   }
 
   AcpiTable = NULL;