tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OvmfPkg/PlatformPei: Merge Xen support into MemMapInitialization 

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Wei Liu <wei.liu2@citrix.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15205 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Jordan Justen 2014-02-01 21:22:43 +00:00 committed by jljusten
parent c191a58fac
commit 4b455f7bf0
3 changed files with 33 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OvmfPkg/PlatformPei/MemDetect.c
View File

@ -1,7 +1,7 @@
/**@file /**@file
Memory Detection for Virtual Machines. Memory Detection for Virtual Machines.
Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -35,9 +35,9 @@ Module Name:
#include "Platform.h" #include "Platform.h"
#include "Cmos.h" #include "Cmos.h"
STATIC UINT32
UINTN
GetSystemMemorySizeBelow4gb ( GetSystemMemorySizeBelow4gb (
VOID
) )
{ {
UINT8 Cmos0x34; UINT8 Cmos0x34;

84
OvmfPkg/PlatformPei/Platform.c
View File

@ -164,7 +164,7 @@ AddUntestedMemoryRangeHob (
} }
VOID VOID
XenMemMapInitialization ( MemMapInitialization (
VOID VOID
) )
{ {
@ -193,55 +193,29 @@ XenMemMapInitialization (
// //
AddIoMemoryRangeHob (0x0A0000, BASE_1MB); AddIoMemoryRangeHob (0x0A0000, BASE_1MB);
XenPublishRamRegions (); if (!mXen) {
} UINT32 TopOfLowRam;
TopOfLowRam = GetSystemMemorySizeBelow4gb ();
//
VOID // address purpose size
MemMapInitialization ( // ------------ -------- -------------------------
EFI_PHYSICAL_ADDRESS TopOfMemory // max(top, 2g) PCI MMIO 0xFC000000 - max(top, 2g)
) // 0xFC000000 gap 44 MB
{ // 0xFEC00000 IO-APIC 4 KB
// // 0xFEC01000 gap 1020 KB
// Create Memory Type Information HOB // 0xFED00000 HPET 1 KB
// // 0xFED00400 gap 1023 KB
BuildGuidDataHob ( // 0xFEE00000 LAPIC 1 MB
&gEfiMemoryTypeInformationGuid, //
mDefaultMemoryTypeInformation, AddIoMemoryRangeHob (TopOfLowRam < BASE_2GB ?
sizeof(mDefaultMemoryTypeInformation) BASE_2GB : TopOfLowRam, 0xFC000000);
); AddIoMemoryBaseSizeHob (0xFEC00000, SIZE_4KB);
AddIoMemoryBaseSizeHob (0xFED00000, SIZE_1KB);
// AddIoMemoryBaseSizeHob (PcdGet32(PcdCpuLocalApicBaseAddress), SIZE_1MB);
// Add PCI IO Port space available for PCI resource allocations. } else {
// XenPublishRamRegions ();
BuildResourceDescriptorHob ( }
EFI_RESOURCE_IO,
EFI_RESOURCE_ATTRIBUTE_PRESENT |
EFI_RESOURCE_ATTRIBUTE_INITIALIZED,
0xC000,
0x4000
);
//
// Video memory + Legacy BIOS region
//
AddIoMemoryRangeHob (0x0A0000, BASE_1MB);
//
// address purpose size
// ------------ -------- -------------------------
// max(top, 2g) PCI MMIO 0xFC000000 - max(top, 2g)
// 0xFC000000 gap 44 MB
// 0xFEC00000 IO-APIC 4 KB
// 0xFEC01000 gap 1020 KB
// 0xFED00000 HPET 1 KB
// 0xFED00400 gap 1023 KB
// 0xFEE00000 LAPIC 1 MB
//
AddIoMemoryRangeHob (TopOfMemory < BASE_2GB ? BASE_2GB : TopOfMemory, 0xFC000000);
AddIoMemoryBaseSizeHob (0xFEC00000, SIZE_4KB);
AddIoMemoryBaseSizeHob (0xFED00000, SIZE_1KB);
AddIoMemoryBaseSizeHob (PcdGet32(PcdCpuLocalApicBaseAddress), SIZE_1MB);
} }
@ -370,10 +344,6 @@ InitializePlatform (
IN CONST EFI_PEI_SERVICES **PeiServices IN CONST EFI_PEI_SERVICES **PeiServices
) )
{ {
EFI_PHYSICAL_ADDRESS TopOfMemory;
TopOfMemory = 0;
DEBUG ((EFI_D_ERROR, "Platform PEIM Loaded\n")); DEBUG ((EFI_D_ERROR, "Platform PEIM Loaded\n"));
DebugDumpCmos (); DebugDumpCmos ();
@ -385,7 +355,7 @@ InitializePlatform (
PublishPeiMemory (); PublishPeiMemory ();
if (!mXen) { if (!mXen) {
TopOfMemory = MemDetect (); MemDetect ();
} }
if (mXen) { if (mXen) {
@ -397,11 +367,7 @@ InitializePlatform (
PeiFvInitialization (); PeiFvInitialization ();
if (mXen) { MemMapInitialization ();
XenMemMapInitialization ();
} else {
MemMapInitialization (TopOfMemory);
}
MiscInitialization (); MiscInitialization ();

5
OvmfPkg/PlatformPei/Platform.h
View File

@ -64,6 +64,11 @@ PublishPeiMemory (
VOID VOID
); );
UINT32
GetSystemMemorySizeBelow4gb (
VOID
);
EFI_PHYSICAL_ADDRESS EFI_PHYSICAL_ADDRESS
MemDetect ( MemDetect (
VOID VOID