BaseTools:Add import in FvImageSection

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

diff --git a/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmaProtection.c b/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmaProtection.c
index 86d50eb6f2882041ce9f5a63254552e5ae2baec6..956ebb2d3d3d5c77be22e631c288b1a73b1daaee 100644 (file)
--- a/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmaProtection.c
+++ b/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmaProtection.c
@@ -1,13 +1,7 @@
 /** @file\r
 \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
-  http://opensource.org/licenses/bsd-license.php.\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+  Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -515,7 +509,13 @@ SetupVtd (
 \r
   ParseDmarAcpiTableRmrr ();\r
 \r
-  ProcessRequestedAccessAttribute ();\r
+  if ((PcdGet8 (PcdVTdPolicyPropertyMask) & BIT2) == 0) {\r
+    //\r
+    // Support IOMMU access attribute request recording before DMAR table is installed.\r
+    // Here is to process the requests.\r
+    //\r
+    ProcessRequestedAccessAttribute ();\r
+  }\r
 \r
   for (Index = 0; Index < mVtdUnitNumber; Index++) {\r
     DEBUG ((DEBUG_INFO,"VTD Unit %d (Segment: %04x)\n", Index, mVtdUnitInformation[Index].Segment));\r
@@ -581,9 +581,20 @@ OnExitBootServices (
   IN VOID                                    *Context\r
   )\r
 {\r
+  UINTN   VtdIndex;\r
+\r
   DEBUG ((DEBUG_INFO, "Vtd OnExitBootServices\n"));\r
   DumpVtdRegsAll ();\r
 \r
+  DEBUG ((DEBUG_INFO, "Invalidate all\n"));\r
+  for (VtdIndex = 0; VtdIndex < mVtdUnitNumber; VtdIndex++) {\r
+    FlushWriteBuffer (VtdIndex);\r
+\r
+    InvalidateContextCache (VtdIndex);\r
+\r
+    InvalidateIOTLB (VtdIndex);\r
+  }\r
+\r
   if ((PcdGet8(PcdVTdPolicyPropertyMask) & BIT1) == 0) {\r
     DisableDmar ();\r
     DumpVtdRegsAll ();\r