From 9a934eb683b7ffb8c35f52263fd29d20618e4b4c Mon Sep 17 00:00:00 2001 From: mintsuki Date: Sun, 22 Aug 2021 17:57:52 +0200 Subject: [PATCH] efi: Leave 64MiB to firmware instead of 16MiB --- Makefile | 16 ++++++++-------- stage23/mm/pmm.s2.c | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index d77e0ae5..a9566557 100644 --- a/Makefile +++ b/Makefile @@ -319,12 +319,12 @@ full-hybrid-test: cp -rv bin/* test/* test_image/boot/ xorriso -as mkisofs -b boot/limine-cd.bin -no-emul-boot -boot-load-size 4 -boot-info-table --efi-boot boot/limine-eltorito-efi.bin -efi-boot-part --efi-boot-image --protective-msdos-label test_image/ -o test.iso bin/limine-install test.iso - qemu-system-x86_64 -M q35 -bios ovmf-x64/OVMF.fd -net none -smp 4 -enable-kvm -cpu host -cdrom test.iso -debugcon stdio - qemu-system-x86_64 -M q35 -bios ovmf-x64/OVMF.fd -net none -smp 4 -enable-kvm -cpu host -hda test.iso -debugcon stdio - qemu-system-x86_64 -M q35 -bios ovmf-ia32/OVMF.fd -net none -smp 4 -enable-kvm -cpu host -cdrom test.iso -debugcon stdio - qemu-system-x86_64 -M q35 -bios ovmf-ia32/OVMF.fd -net none -smp 4 -enable-kvm -cpu host -hda test.iso -debugcon stdio - qemu-system-x86_64 -M q35 -net none -smp 4 -enable-kvm -cpu host -cdrom test.iso -debugcon stdio - qemu-system-x86_64 -M q35 -net none -smp 4 -enable-kvm -cpu host -hda test.iso -debugcon stdio + qemu-system-x86_64 -m 512M -M q35 -bios ovmf-x64/OVMF.fd -net none -smp 4 -enable-kvm -cpu host -cdrom test.iso -debugcon stdio + qemu-system-x86_64 -m 512M -M q35 -bios ovmf-x64/OVMF.fd -net none -smp 4 -enable-kvm -cpu host -hda test.iso -debugcon stdio + qemu-system-x86_64 -m 512M -M q35 -bios ovmf-ia32/OVMF.fd -net none -smp 4 -enable-kvm -cpu host -cdrom test.iso -debugcon stdio + qemu-system-x86_64 -m 512M -M q35 -bios ovmf-ia32/OVMF.fd -net none -smp 4 -enable-kvm -cpu host -hda test.iso -debugcon stdio + qemu-system-x86_64 -m 512M -M q35 -net none -smp 4 -enable-kvm -cpu host -cdrom test.iso -debugcon stdio + qemu-system-x86_64 -m 512M -M q35 -net none -smp 4 -enable-kvm -cpu host -hda test.iso -debugcon stdio .PHONY: pxe-test pxe-test: @@ -357,7 +357,7 @@ uefi-test: sudo umount test_image/ sudo losetup -d `cat loopback_dev` rm -rf test_image loopback_dev - qemu-system-x86_64 -M q35 -L ovmf -bios ovmf-x64/OVMF.fd -net none -smp 4 -enable-kvm -cpu host -hda test.hdd -debugcon stdio + qemu-system-x86_64 -m 512M -M q35 -L ovmf -bios ovmf-x64/OVMF.fd -net none -smp 4 -enable-kvm -cpu host -hda test.hdd -debugcon stdio .PHONY: uefi32-test uefi32-test: @@ -380,4 +380,4 @@ uefi32-test: sudo umount test_image/ sudo losetup -d `cat loopback_dev` rm -rf test_image loopback_dev - qemu-system-x86_64 -M q35 -L ovmf -bios ovmf-ia32/OVMF.fd -net none -smp 4 -enable-kvm -cpu host -hda test.hdd -debugcon stdio + qemu-system-x86_64 -m 512M -M q35 -L ovmf -bios ovmf-ia32/OVMF.fd -net none -smp 4 -enable-kvm -cpu host -hda test.hdd -debugcon stdio diff --git a/stage23/mm/pmm.s2.c b/stage23/mm/pmm.s2.c index cb74d057..3283c7c5 100644 --- a/stage23/mm/pmm.s2.c +++ b/stage23/mm/pmm.s2.c @@ -321,8 +321,8 @@ void init_memmap(void) { allocations_disallowed = false; - // Let's leave 16MiB to the firmware - ext_mem_alloc_type(0x1000000, MEMMAP_EFI_RECLAIMABLE); + // Let's leave 64MiB to the firmware + ext_mem_alloc_type(0x4000000, MEMMAP_EFI_RECLAIMABLE); memcpy(untouched_memmap, memmap, memmap_entries * sizeof(struct e820_entry_t)); untouched_memmap_entries = memmap_entries;