diff options
| author | Star Zeng <star.zeng@intel.com> | 2017-11-23 08:55:02 +0800 |
|---|---|---|
| committer | Star Zeng <star.zeng@intel.com> | 2017-11-23 10:43:43 +0800 |
| commit | 7729e3c448a116eb5b6198f0f70355f421df43fa (patch) | |
| tree | 23682fb8572986aba1fc314e8ac55a0c82bc214c /IntelSiliconPkg | |
| parent | 2d3a626e3e9577348f9ef4cf6b3118d5e81063cf (diff) | |
| download | edk2-7729e3c448a116eb5b6198f0f70355f421df43fa.tar.gz | |
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>
Diffstat (limited to 'IntelSiliconPkg')
3 files changed, 10 insertions, 5 deletions
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;
|