54ee6176ed
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1119 Today's implementation reports CPU address size as 36 through CPU HOB. But when WinHost is running at 64bit, the system memory might be allocated above 2^36. It causes system asserts when DxeCore code tries to find the corresponding GCD entry for a given valid address. The patch uses 57 as the CPU address size which is maximum linear address size when 5-level paging is enabled in host OS. Using 64 seems more proper and a one-time change even 6-level paging might be invented. But it causes CoreInitializeGcdServices() assertion on following code: Entry->EndAddress = LShiftU64 (1, SizeOfMemorySpace) - 1; Because LShiftU64 expects SizeOfMemorySpace < 64. So to be practical, I didn't report 64 and change CoreInitializeGcdServices(). Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com> Reviewed-by: Hao Wu <hao.a.wu@intel.com> Cc: Andrew Fish <afish@apple.com>
110 lines
3.0 KiB
C
110 lines
3.0 KiB
C
/*++ @file
|
|
|
|
Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
|
|
Portions copyright (c) 2011, Apple Inc. All rights reserved.
|
|
This program and the accompanying materials
|
|
are licensed and made available under the terms and conditions of the BSD License
|
|
which accompanies this distribution. The full text of the license may be found at
|
|
http://opensource.org/licenses/bsd-license.php
|
|
|
|
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
|
|
|
**/
|
|
|
|
#include "PiPei.h"
|
|
#include <Ppi/EmuThunk.h>
|
|
#include <Ppi/MemoryDiscovered.h>
|
|
|
|
#include <Library/DebugLib.h>
|
|
#include <Library/PeimEntryPoint.h>
|
|
#include <Library/BaseLib.h>
|
|
#include <Library/BaseMemoryLib.h>
|
|
#include <Library/HobLib.h>
|
|
#include <Library/PeiServicesLib.h>
|
|
#include <Library/PeiServicesTablePointerLib.h>
|
|
|
|
EFI_STATUS
|
|
EFIAPI
|
|
PeimInitializeAutoScanPei (
|
|
IN EFI_PEI_FILE_HANDLE FileHandle,
|
|
IN CONST EFI_PEI_SERVICES **PeiServices
|
|
)
|
|
/*++
|
|
|
|
Routine Description:
|
|
Perform a call-back into the SEC simulator to get a memory value
|
|
|
|
Arguments:
|
|
FfsHeader - General purpose data available to every PEIM
|
|
PeiServices - General purpose services available to every PEIM.
|
|
|
|
Returns:
|
|
None
|
|
|
|
**/
|
|
{
|
|
EFI_STATUS Status;
|
|
EFI_PEI_PPI_DESCRIPTOR *PpiDescriptor;
|
|
EMU_THUNK_PPI *Thunk;
|
|
UINT64 MemorySize;
|
|
EFI_PHYSICAL_ADDRESS MemoryBase;
|
|
UINTN Index;
|
|
EFI_RESOURCE_ATTRIBUTE_TYPE Attributes;
|
|
|
|
|
|
DEBUG ((EFI_D_ERROR, "Emu Autoscan PEIM Loaded\n"));
|
|
|
|
//
|
|
// Get the PEI UNIX Autoscan PPI
|
|
//
|
|
Status = PeiServicesLocatePpi (
|
|
&gEmuThunkPpiGuid, // GUID
|
|
0, // INSTANCE
|
|
&PpiDescriptor, // EFI_PEI_PPI_DESCRIPTOR
|
|
(VOID **)&Thunk // PPI
|
|
);
|
|
ASSERT_EFI_ERROR (Status);
|
|
|
|
Index = 0;
|
|
do {
|
|
Status = Thunk->MemoryAutoScan (Index, &MemoryBase, &MemorySize);
|
|
if (!EFI_ERROR (Status)) {
|
|
Attributes =
|
|
(
|
|
EFI_RESOURCE_ATTRIBUTE_PRESENT |
|
|
EFI_RESOURCE_ATTRIBUTE_INITIALIZED |
|
|
EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |
|
|
EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE |
|
|
EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |
|
|
EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE
|
|
);
|
|
|
|
if (Index == 0) {
|
|
//
|
|
// Register the memory with the PEI Core
|
|
//
|
|
Status = PeiServicesInstallPeiMemory (MemoryBase, MemorySize);
|
|
ASSERT_EFI_ERROR (Status);
|
|
|
|
Attributes |= EFI_RESOURCE_ATTRIBUTE_TESTED;
|
|
}
|
|
|
|
BuildResourceDescriptorHob (
|
|
EFI_RESOURCE_SYSTEM_MEMORY,
|
|
Attributes,
|
|
MemoryBase,
|
|
MemorySize
|
|
);
|
|
}
|
|
Index++;
|
|
} while (!EFI_ERROR (Status));
|
|
|
|
//
|
|
// Build the CPU hob with 57-bit addressing and 16-bits of IO space.
|
|
//
|
|
BuildCpuHob (57, 16);
|
|
|
|
return Status;
|
|
}
|