From: Star Zeng <star.zeng@intel.com>
Date: Wed, 25 Oct 2017 08:55:46 +0000 (+0800)
Subject: IntelSiliconPkg IntelVTdDxe: use gEfiAcpi10TableGuid for ACPI 1.0
X-Git-Tag: edk2-stable201903~3173
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=118f1657b9c6c338c25ef81e6c30ece392138673;p=mirror_edk2.git

IntelSiliconPkg IntelVTdDxe: use gEfiAcpi10TableGuid for ACPI 1.0

According to definition (Acpi.h and MdePkg.dec),
gEfiAcpiTableGuid = gEfiAcpi20TableGuid, and the code is trying
to parse ACPI 2.0 first and then ACPI 1.0, but it uses
gEfiAcpiTableGuid wrongly for ACPI 1.0, this patch is to fix it.

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

diff --git a/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c b/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c
index 2456b0c48f..39b70a134e 100644
--- a/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c
+++ b/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c
@@ -996,7 +996,7 @@ GetDmarAcpiTable (
              );
   if (EFI_ERROR (Status)) {
     Status = EfiGetSystemConfigurationTable (
-               &gEfiAcpiTableGuid,
+               &gEfiAcpi10TableGuid,
                &AcpiTable
                );
   }
diff --git a/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/IntelVTdDxe.inf b/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/IntelVTdDxe.inf
index d45fd67964..fde33bb224 100644
--- a/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/IntelVTdDxe.inf
+++ b/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/IntelVTdDxe.inf
@@ -64,7 +64,7 @@
 [Guids]
   gEfiEventExitBootServicesGuid   ## CONSUMES ## Event
   gEfiAcpi20TableGuid             ## CONSUMES ## SystemTable
-  gEfiAcpiTableGuid               ## CONSUMES ## SystemTable
+  gEfiAcpi10TableGuid             ## CONSUMES ## SystemTable
 
 [Protocols]
   gEdkiiIoMmuProtocolGuid                     ## PRODUCES