Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jan 31, 2025
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
#define MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS 5

//
// mach-virt's core peripherals such as the UART and the RTC are all mapped in
// the 'miscellaneous device I/O' region, which we just map in its entirety
// rather than device by device. Note that it does not cover the GIC, any of
// the NOR flash banks or PCI resource windows.
// mach-virt's core peripherals such as the UART, the GIC and the RTC are
// all mapped in the 'miscellaneous device I/O' region, which we just map
// in its entirety rather than device by device. Note that it does not
// cover any of the NOR flash banks or PCI resource windows.
//
#define MACH_VIRT_PERIPH_BASE 0x09000000
#define MACH_VIRT_PERIPH_SIZE SIZE_32MB
#define MACH_VIRT_PERIPH_BASE 0x08000000
#define MACH_VIRT_PERIPH_SIZE SIZE_128MB

/**
Default library constructor that obtains the memory size from a PCD.
Expand Down Expand Up @@ -105,7 +105,7 @@ ArmVirtGetMemoryMap (
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].VirtualBase = MACH_VIRT_PERIPH_BASE;
VirtualMemoryTable[1].Length = MACH_VIRT_PERIPH_SIZE;
Expand Down
Loading