/** @file\r
\r
- Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>\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
\r
#pragma pack()\r
\r
-EFI_ACPI_DMAR_HEADER *mAcpiDmarTable;\r
+EFI_ACPI_DMAR_HEADER *mAcpiDmarTable = NULL;\r
\r
/**\r
Dump DMAR DeviceScopeEntry.\r
" X2APIC_OPT_OUT_SET ................................. 0x%02x\n",\r
Dmar->Flags & EFI_ACPI_DMAR_FLAGS_X2APIC_OPT_OUT\r
));\r
+ DEBUG ((DEBUG_INFO,\r
+ " DMA_CTRL_PLATFORM_OPT_IN_FLAG ...................... 0x%02x\n",\r
+ Dmar->Flags & EFI_ACPI_DMAR_FLAGS_DMA_CTRL_PLATFORM_OPT_IN_FLAG\r
+ ));\r
\r
DmarLen = Dmar->Header.Length - sizeof(EFI_ACPI_DMAR_HEADER);\r
DmarHeader = (EFI_ACPI_DMAR_STRUCTURE_HEADER *)(Dmar + 1);\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
- mVtdHostAddressWidthMask = LShiftU64 (1ull, mAcpiDmarTable->HostAddressWidth) - 1;\r
-\r
VtdIndex = 0;\r
DmarHeader = (EFI_ACPI_DMAR_STRUCTURE_HEADER *)((UINTN)(mAcpiDmarTable + 1));\r
while ((UINTN)DmarHeader < (UINTN)mAcpiDmarTable + mAcpiDmarTable->Header.Length) {\r
EntryPtr = &Rsdt->Entry;\r
for (Index = 0; Index < EntryCount; Index ++, EntryPtr ++) {\r
Table = (EFI_ACPI_DESCRIPTION_HEADER*)((UINTN)(*EntryPtr));\r
- if (Table->Signature == Signature) {\r
+ if ((Table != NULL) && (Table->Signature == Signature)) {\r
return Table;\r
}\r
}\r
for (Index = 0; Index < EntryCount; Index ++) {\r
CopyMem (&EntryPtr, (VOID *)(BasePtr + Index * sizeof(UINT64)), sizeof(UINT64));\r
Table = (EFI_ACPI_DESCRIPTION_HEADER*)((UINTN)(EntryPtr));\r
- if (Table->Signature == Signature) {\r
+ if ((Table != NULL) && (Table->Signature == Signature)) {\r
return Table;\r
}\r
}\r
/**\r
Get the DMAR ACPI table.\r
\r
- @retval EFI_SUCCESS The DMAR ACPI table is got.\r
- @retval EFI_NOT_FOUND The DMAR ACPI table is not found.\r
+ @retval EFI_SUCCESS The DMAR ACPI table is got.\r
+ @retval EFI_ALREADY_STARTED The DMAR ACPI table has been got previously.\r
+ @retval EFI_NOT_FOUND The DMAR ACPI table is not found.\r
**/\r
EFI_STATUS\r
GetDmarAcpiTable (\r
EFI_STATUS Status;\r
\r
if (mAcpiDmarTable != NULL) {\r
- return EFI_SUCCESS;\r
+ return EFI_ALREADY_STARTED;\r
}\r
\r
AcpiTable = NULL;\r
&AcpiTable\r
);\r
}\r
+ if (EFI_ERROR (Status)) {\r
+ return EFI_NOT_FOUND;\r
+ }\r
ASSERT (AcpiTable != NULL);\r
\r
mAcpiDmarTable = FindAcpiPtr (\r