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

Revert "ArmVirtPkg/ArmVirtQemu: Reduce MMIO region mapped by default" 

This reverts commit 43233ff9f8.

The TPM code (and possibly others too) must be fixed to also
map their MMIO ranges before we can do this cleanup.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2025-01-31 12:27:25 +01:00 committed by mergify[bot]
parent 4dd8b9e0f7
commit fbe19844e0
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.c
View File

@ -18,13 +18,13 @@
#define MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS 5 #define MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS 5
// //
// mach-virt's core peripherals such as the UART and the RTC are all mapped in // mach-virt's core peripherals such as the UART, the GIC and the RTC are
// the 'miscellaneous device I/O' region, which we just map in its entirety // all mapped in the 'miscellaneous device I/O' region, which we just map
// rather than device by device. Note that it does not cover the GIC, any of // in its entirety rather than device by device. Note that it does not
// the NOR flash banks or PCI resource windows. // cover any of the NOR flash banks or PCI resource windows.
// //
#define MACH_VIRT_PERIPH_BASE 0x09000000 #define MACH_VIRT_PERIPH_BASE 0x08000000
#define MACH_VIRT_PERIPH_SIZE SIZE_32MB #define MACH_VIRT_PERIPH_SIZE SIZE_128MB
/** /**
Default library constructor that obtains the memory size from a PCD. Default library constructor that obtains the memory size from a PCD.
@ -105,7 +105,7 @@ ArmVirtGetMemoryMap (
VirtualMemoryTable[0].Length VirtualMemoryTable[0].Length
)); ));
// Memory mapped peripherals (UART, RTC, virtio-mmio, etc) // Memory mapped peripherals (UART, RTC, GIC, virtio-mmio, etc)
VirtualMemoryTable[1].PhysicalBase = MACH_VIRT_PERIPH_BASE; VirtualMemoryTable[1].PhysicalBase = MACH_VIRT_PERIPH_BASE;
VirtualMemoryTable[1].VirtualBase = MACH_VIRT_PERIPH_BASE; VirtualMemoryTable[1].VirtualBase = MACH_VIRT_PERIPH_BASE;
VirtualMemoryTable[1].Length = MACH_VIRT_PERIPH_SIZE; VirtualMemoryTable[1].Length = MACH_VIRT_PERIPH_SIZE;