mirror of https://github.com/acidanthera/audk.git
ArmVirtPkg/ArmVirtXen: add ArmVirtMemInfoLib implementation
Clone the existing ArmPlatformGetVirtualMemoryMap () for this platform, clean it up slightly (by using a static buffer rather than a heap allocation, and removing the support for uncached DRAM mappings), and turn it into a new ArmVirtMemInfoLib implementation. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Acked-by: Laszlo Ersek <lersek@redhat.com> Tested-by: Julien Grall <julien.grall@linaro.org>
This commit is contained in:
Ard Biesheuvel
parent
77ca918281
commit
496cf19ac2
|
|
@ -44,6 +44,7 @@
|
|||
VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceLib.inf
|
||||
|
||||
ArmPlatformLib|ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/ArmXenRelocatablePlatformLib.inf
|
||||
ArmVirtMemInfoLib|ArmVirtPkg/Library/XenVirtMemInfoLib/XenVirtMemInfoLib.inf
|
||||
|
||||
TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,39 @@
|
|||
#
|
||||
# Copyright (c) 2011-2013, ARM Limited. All rights reserved.
|
||||
# Copyright (c) 2016-2017, Linaro Limited. 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 <AsmMacroIoLibV8.h>
|
||||
|
||||
//EFI_PHYSICAL_ADDRESS
|
||||
//GetPhysAddrTop (
|
||||
// VOID
|
||||
// );
|
||||
ASM_FUNC(ArmGetPhysAddrTop)
|
||||
mrs x0, id_aa64mmfr0_el1
|
||||
adr x1, .LPARanges
|
||||
and x0, x0, #7
|
||||
ldrb w1, [x1, x0]
|
||||
mov x0, #1
|
||||
lsl x0, x0, x1
|
||||
ret
|
||||
|
||||
//
|
||||
// Bits 0..2 of the AA64MFR0_EL1 system register encode the size of the
|
||||
// physical address space support on this CPU:
|
||||
// 0 == 32 bits, 1 == 36 bits, etc etc
|
||||
// 6 and 7 are reserved
|
||||
//
|
||||
.LPARanges:
|
||||
.byte 32, 36, 40, 42, 44, 48, -1, -1
|
||||
|
||||
ASM_FUNCTION_REMOVE_IF_UNREFERENCED
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
#
|
||||
# Copyright (c) 2011-2013, ARM Limited. All rights reserved.
|
||||
# Copyright (c) 2014-2017, Linaro Limited. 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 <AsmMacroIoLib.h>
|
||||
|
||||
//EFI_PHYSICAL_ADDRESS
|
||||
//GetPhysAddrTop (
|
||||
// VOID
|
||||
// );
|
||||
ASM_FUNC(ArmGetPhysAddrTop)
|
||||
mov r0, #0x00000000
|
||||
mov r1, #0x10000
|
||||
bx lr
|
||||
|
|
@ -0,0 +1,63 @@
|
|||
/** @file
|
||||
|
||||
Copyright (c) 2014-2017, Linaro Limited. 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 <Base.h>
|
||||
#include <Library/ArmLib.h>
|
||||
#include <Library/DebugLib.h>
|
||||
|
||||
STATIC ARM_MEMORY_REGION_DESCRIPTOR mVirtualMemoryTable[2];
|
||||
|
||||
EFI_PHYSICAL_ADDRESS
|
||||
ArmGetPhysAddrTop (
|
||||
VOID
|
||||
);
|
||||
|
||||
/**
|
||||
Return the Virtual Memory Map of your platform
|
||||
|
||||
This Virtual Memory Map is used by MemoryInitPei Module to initialize the MMU
|
||||
on your platform.
|
||||
|
||||
@param[out] VirtualMemoryMap Array of ARM_MEMORY_REGION_DESCRIPTOR
|
||||
describing a Physical-to-Virtual Memory
|
||||
mapping. This array must be ended by a
|
||||
zero-filled entry. The allocated memory
|
||||
will not be freed.
|
||||
|
||||
**/
|
||||
VOID
|
||||
EFIAPI
|
||||
ArmVirtGetMemoryMap (
|
||||
OUT ARM_MEMORY_REGION_DESCRIPTOR **VirtualMemoryMap
|
||||
)
|
||||
{
|
||||
ASSERT (VirtualMemoryMap != NULL);
|
||||
|
||||
//
|
||||
// Map the entire physical memory space as cached. The only device
|
||||
// we care about is the GIC, which will be stage 2 mapped as a device
|
||||
// by the hypervisor, overriding the cached mapping we install here.
|
||||
//
|
||||
mVirtualMemoryTable[0].PhysicalBase = 0x0;
|
||||
mVirtualMemoryTable[0].VirtualBase = 0x0;
|
||||
mVirtualMemoryTable[0].Length = ArmGetPhysAddrTop ();
|
||||
mVirtualMemoryTable[0].Attributes = ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK;
|
||||
|
||||
mVirtualMemoryTable[1].PhysicalBase = 0x0;
|
||||
mVirtualMemoryTable[1].VirtualBase = 0x0;
|
||||
mVirtualMemoryTable[1].Length = 0x0;
|
||||
mVirtualMemoryTable[1].Attributes = 0x0;
|
||||
|
||||
*VirtualMemoryMap = mVirtualMemoryTable;
|
||||
}
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
#/* @file
|
||||
#
|
||||
# Copyright (c) 2011-2015, ARM Limited. All rights reserved.
|
||||
# Copyright (c) 2014-2017, Linaro Limited. 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.
|
||||
#
|
||||
#*/
|
||||
|
||||
[Defines]
|
||||
INF_VERSION = 0x0001001A
|
||||
BASE_NAME = XenVirtMemInfoLib
|
||||
FILE_GUID = 40d1f8f5-4dfe-4e0f-9a15-b1de9dc9f4ed
|
||||
MODULE_TYPE = BASE
|
||||
VERSION_STRING = 1.0
|
||||
LIBRARY_CLASS = ArmVirtMemInfoLib
|
||||
|
||||
[Sources]
|
||||
XenVirtMemInfoLib.c
|
||||
|
||||
[Sources.ARM]
|
||||
Arm/PhysAddrTop.S
|
||||
|
||||
[Sources.AARCH64]
|
||||
AArch64/PhysAddrTop.S
|
||||
|
||||
[Packages]
|
||||
ArmPkg/ArmPkg.dec
|
||||
ArmVirtPkg/ArmVirtPkg.dec
|
||||
MdeModulePkg/MdeModulePkg.dec
|
||||
MdePkg/MdePkg.dec
|
||||
|
||||
[LibraryClasses]
|
||||
ArmLib
|
||||
DebugLib
|
||||
Loading…
Reference in New Issue