/** @file\r
\r
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
\r
This program and the accompanying materials\r
are licensed and made available under the terms and conditions\r
EFI_PHYSICAL_ADDRESS mReserveSmbiosEntryPoint = 0;\r
EFI_PHYSICAL_ADDRESS mStructureTableAddress = 0;\r
UINTN mStructureTablePages = 0;\r
+BOOLEAN mEndOfDxe = FALSE;\r
\r
/**\r
- Do an AllocatePages () of type AllocateMaxAddress for EfiBootServicesCode\r
- memory.\r
+ Allocate memory for legacy usage.\r
\r
- @param AllocateType Allocated Legacy Memory Type\r
+ @param AllocateType The type of allocation to perform.\r
+ @param MemoryType The type of memory to allocate.\r
@param StartPageAddress Start address of range\r
@param Pages Number of pages to allocate\r
@param Result Result of allocation\r
EFI_STATUS\r
AllocateLegacyMemory (\r
IN EFI_ALLOCATE_TYPE AllocateType,\r
+ IN EFI_MEMORY_TYPE MemoryType,\r
IN EFI_PHYSICAL_ADDRESS StartPageAddress,\r
IN UINTN Pages,\r
OUT EFI_PHYSICAL_ADDRESS *Result\r
MemPage = (EFI_PHYSICAL_ADDRESS) (UINTN) StartPageAddress;\r
Status = gBS->AllocatePages (\r
AllocateType,\r
- EfiBootServicesCode,\r
+ MemoryType,\r
Pages,\r
&MemPage\r
);\r
}\r
}\r
\r
+/**\r
+ Callback function to toggle EndOfDxe status. NULL pointer detection needs\r
+ this status to decide if it's necessary to change attributes of page 0.\r
+\r
+ @param Event Event whose notification function is being invoked.\r
+ @param Context The pointer to the notification function's context,\r
+ which is implementation-dependent.\r
+\r
+**/\r
+VOID\r
+EFIAPI\r
+ToggleEndOfDxeStatus (\r
+ IN EFI_EVENT Event,\r
+ IN VOID *Context\r
+ )\r
+{\r
+ mEndOfDxe = TRUE;\r
+ return;\r
+}\r
+\r
/**\r
Install Driver to produce Legacy BIOS protocol.\r
\r
UINT64 Length;\r
UINT8 *SecureBoot;\r
EFI_EVENT InstallSmbiosEvent;\r
+ EFI_EVENT EndOfDxeEvent;\r
\r
//\r
// Load this driver's image to memory\r
//\r
AllocateLegacyMemory (\r
AllocateAddress,\r
+ EfiReservedMemoryType,\r
0,\r
1,\r
&MemoryAddress\r
// Initialize region from 0x0000 to 4k. This initializes interrupt vector\r
// range.\r
//\r
- gBS->SetMem ((VOID *) ClearPtr, 0x400, INITIAL_VALUE_BELOW_1K);\r
- ZeroMem ((VOID *) ((UINTN)ClearPtr + 0x400), 0xC00);\r
+ ACCESS_PAGE0_CODE (\r
+ gBS->SetMem ((VOID *) ClearPtr, 0x400, INITIAL_VALUE_BELOW_1K);\r
+ ZeroMem ((VOID *) ((UINTN)ClearPtr + 0x400), 0xC00);\r
+ );\r
\r
//\r
// Allocate pages for OPROM usage\r
\r
Status = AllocateLegacyMemory (\r
AllocateAddress,\r
+ EfiReservedMemoryType,\r
CONVENTIONAL_MEMORY_TOP - MemorySize,\r
EFI_SIZE_TO_PAGES (MemorySize),\r
&MemoryAddress\r
for (MemStart = MemoryAddress; MemStart < MemoryAddress + MemorySize; MemStart += 0x1000) {\r
Status = AllocateLegacyMemory (\r
AllocateAddress,\r
+ EfiBootServicesCode,\r
MemStart,\r
1,\r
&StartAddress\r
ASSERT ((MemorySize & 0xFFF) == 0); \r
Status = AllocateLegacyMemory (\r
AllocateMaxAddress,\r
+ EfiBootServicesCode,\r
CONVENTIONAL_MEMORY_TOP,\r
EFI_SIZE_TO_PAGES (MemorySize),\r
&MemoryAddressUnder1MB\r
//\r
Status = AllocateLegacyMemory (\r
AllocateMaxAddress,\r
+ EfiReservedMemoryType,\r
CONVENTIONAL_MEMORY_TOP,\r
(sizeof (LOW_MEMORY_THUNK) / EFI_PAGE_SIZE) + 2,\r
&MemoryAddress\r
// \r
Status = AllocateLegacyMemory (\r
AllocateMaxAddress,\r
+ EfiBootServicesCode,\r
0x1000000,\r
EFI_SIZE_TO_PAGES (MemorySize),\r
&MemoryAddress\r
// \r
Status = AllocateLegacyMemory (\r
AllocateMaxAddress,\r
+ EfiBootServicesCode,\r
0xFFFFFFFF,\r
EFI_SIZE_TO_PAGES (MemorySize),\r
&MemoryAddress\r
//\r
// Save Unexpected interrupt vector so can restore it just prior to boot\r
//\r
- BaseVectorMaster = (UINT32 *) (sizeof (UINT32) * PROTECTED_MODE_BASE_VECTOR_MASTER);\r
- Private->BiosUnexpectedInt = BaseVectorMaster[0];\r
- IntRedirCode = (UINT32) (UINTN) Private->IntThunk->InterruptRedirectionCode;\r
- for (Index = 0; Index < 8; Index++) {\r
- BaseVectorMaster[Index] = (EFI_SEGMENT (IntRedirCode + Index * 4) << 16) | EFI_OFFSET (IntRedirCode + Index * 4);\r
- }\r
+ ACCESS_PAGE0_CODE (\r
+ BaseVectorMaster = (UINT32 *) (sizeof (UINT32) * PROTECTED_MODE_BASE_VECTOR_MASTER);\r
+ Private->BiosUnexpectedInt = BaseVectorMaster[0];\r
+ IntRedirCode = (UINT32) (UINTN) Private->IntThunk->InterruptRedirectionCode;\r
+ for (Index = 0; Index < 8; Index++) {\r
+ BaseVectorMaster[Index] = (EFI_SEGMENT (IntRedirCode + Index * 4) << 16) | EFI_OFFSET (IntRedirCode + Index * 4);\r
+ }\r
+ );\r
+\r
//\r
// Save EFI value\r
//\r
);\r
ASSERT_EFI_ERROR (Status); \r
\r
+ //\r
+ // Create callback to update status of EndOfDxe, which is needed by NULL\r
+ // pointer detection\r
+ //\r
+ Status = gBS->CreateEventEx (\r
+ EVT_NOTIFY_SIGNAL,\r
+ TPL_NOTIFY,\r
+ ToggleEndOfDxeStatus,\r
+ NULL,\r
+ &gEfiEndOfDxeEventGroupGuid,\r
+ &EndOfDxeEvent\r
+ );\r
+ ASSERT_EFI_ERROR (Status);\r
+\r
//\r
// Make a new handle and install the protocol\r
//\r