Aren
/
rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MTRR: Ensure size of MTRR range is aligned to the closest power of 2

This commit is contained in:
mintsuki 2020-09-27 19:14:09 +02:00
parent 86a69d8724
commit 98c5b88f5e
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -10,7 +10,6 @@ all: stage2 decompressor
clean: stage2-clean decompressor-clean
rm -f stage2/stage2.bin.gz
#rm -f limine-install
stage2:
$(MAKE) -C stage2 all
@ -36,16 +35,16 @@ test.img:
parted -s test.img mklabel msdos
parted -s test.img mkpart primary 2048s 100%
echfs-test: limine-install test.img
echfs-test: test.img
$(MAKE) -C test
echfs-utils -m -p0 test.img quick-format 512
echfs-utils -m -p0 test.img import test/test.elf boot/test.elf
echfs-utils -m -p0 test.img import test/limine.cfg limine.cfg
echfs-utils -m -p0 test.img import test/bg.bmp bg.bmp
./limine-install limine.bin test.img
qemu-system-x86_64 -net none -smp 4 -hda test.img -debugcon stdio -enable-kvm
qemu-system-x86_64 -net none -smp 4 -hda test.img -debugcon stdio
ext2-test: limine-install test.img
ext2-test: test.img
$(MAKE) -C test
rm -rf test_image/
mkdir test_image
@ -61,9 +60,9 @@ ext2-test: limine-install test.img
sudo losetup -d `cat loopback_dev`
rm -rf test_image loopback_dev
./limine-install limine.bin test.img
qemu-system-x86_64 -hda test.img -debugcon stdio
qemu-system-x86_64 -hda test.img -smp 4 -debugcon stdio
fat32-test: limine-install test.img
fat32-test: test.img
$(MAKE) -C test
rm -rf test_image/
mkdir test_image
@ -79,4 +78,4 @@ fat32-test: limine-install test.img
sudo losetup -d `cat loopback_dev`
rm -rf test_image loopback_dev
./limine-install limine.bin test.img
qemu-system-x86_64 -hda test.img -debugcon stdio
qemu-system-x86_64 -hda test.img -smp 4 -debugcon stdio

BIN
limine.bin
View File

Binary file not shown.

16
stage2/mm/mtrr.c
View File

@ -30,13 +30,25 @@ static bool is_block_in_mtrr_range(struct mtrr *mtrr, uint64_t block_base, uint6
bool mtrr_set_range(uint64_t base, uint64_t size, uint8_t memory_type) {
uint32_t eax, ebx, ecx, edx;
cpuid(0x80000008, 0, &eax, &ebx, &ecx, &edx);
if (cpuid(0x80000008, 0, &eax, &ebx, &ecx, &edx))
return false;
uint8_t maxphysaddr = eax & 0xff;
print("mtrr: Max phys addr: %u\n", maxphysaddr);
base = ALIGN_DOWN(base, 0x1000);
// Size must be aligned on a power of 2 (this is a slow method but this is
// not time sensitive)
for (uint64_t aligned_size = 1; ; aligned_size *= 2) {
if (aligned_size >= size) {
size = aligned_size;
break;
}
}
size = ALIGN_UP(size, 0x1000);
uint64_t mask = (((uint64_t)1 << maxphysaddr) - 1) & ~((uint64_t)size - 1);
uint64_t mask = (((uint64_t)1 << maxphysaddr) - 1) & ~(size - 1);
print("mtrr: Base: %X Mask: %X\n", base, mask);