[edk2] [PATCH] IntelSiliconPkg IntelVTdDxe: use gEfiAcpi10TableGuid for ACPI 1.0

Star Zeng posted 1 patch 6 years, 5 months ago
Failed in applying to current master (apply log)
IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c | 2 +-
IntelSiliconPkg/Feature/VTd/IntelVTdDxe/IntelVTdDxe.inf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
[edk2] [PATCH] IntelSiliconPkg IntelVTdDxe: use gEfiAcpi10TableGuid for ACPI 1.0
Posted by Star Zeng 6 years, 5 months ago
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>
---
 IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c | 2 +-
 IntelSiliconPkg/Feature/VTd/IntelVTdDxe/IntelVTdDxe.inf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c b/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c
index 2456b0c48ff1..39b70a134e1e 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 d45fd67964c9..fde33bb224ca 100644
--- a/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/IntelVTdDxe.inf
+++ b/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/IntelVTdDxe.inf
@@ -64,7 +64,7 @@ [LibraryClasses]
 [Guids]
   gEfiEventExitBootServicesGuid   ## CONSUMES ## Event
   gEfiAcpi20TableGuid             ## CONSUMES ## SystemTable
-  gEfiAcpiTableGuid               ## CONSUMES ## SystemTable
+  gEfiAcpi10TableGuid             ## CONSUMES ## SystemTable
 
 [Protocols]
   gEdkiiIoMmuProtocolGuid                     ## PRODUCES
-- 
2.7.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] IntelSiliconPkg IntelVTdDxe: use gEfiAcpi10TableGuid for ACPI 1.0
Posted by Yao, Jiewen 6 years, 5 months ago
reviewed by: jiewen.yao@intel.com

thank you!
Yao, Jiewen


> 在 2017年10月25日,下午4:59,Star Zeng <star.zeng@intel.com> 写道:
> 
> 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>
> ---
> IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c | 2 +-
> IntelSiliconPkg/Feature/VTd/IntelVTdDxe/IntelVTdDxe.inf | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c b/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c
> index 2456b0c48ff1..39b70a134e1e 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 d45fd67964c9..fde33bb224ca 100644
> --- a/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/IntelVTdDxe.inf
> +++ b/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/IntelVTdDxe.inf
> @@ -64,7 +64,7 @@ [LibraryClasses]
> [Guids]
>   gEfiEventExitBootServicesGuid   ## CONSUMES ## Event
>   gEfiAcpi20TableGuid             ## CONSUMES ## SystemTable
> -  gEfiAcpiTableGuid               ## CONSUMES ## SystemTable
> +  gEfiAcpi10TableGuid             ## CONSUMES ## SystemTable
> 
> [Protocols]
>   gEdkiiIoMmuProtocolGuid                     ## PRODUCES
> -- 
> 2.7.0.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel