:: commit f49fad138c1f4d1156e9b67a1d6d0cc4f63fbceb

mintsuki <mintsuki@protonmail.com> — 2020-09-27 17:17

parents: 98c5b88f5e

MTRR: Fix bug where 2 ANDs should have been ORs

diff --git a/limine.bin b/limine.bin
index af965851..358d3d80 100644
Binary files a/limine.bin and b/limine.bin differ
diff --git a/stage2/mm/mtrr.c b/stage2/mm/mtrr.c
index dfc333ba..e9c64167 100644
--- a/stage2/mm/mtrr.c
+++ b/stage2/mm/mtrr.c
@@ -85,8 +85,8 @@ bool mtrr_set_range(uint64_t base, uint64_t size, uint8_t memory_type) {
             continue;
 
         // Found
-        wrmsr(0x200 + i * 2,     base & memory_type);
-        wrmsr(0x200 + i * 2 + 1, mask & (1 << 11));
+        wrmsr(0x200 + i * 2,     base | memory_type);
+        wrmsr(0x200 + i * 2 + 1, mask | (1 << 11));
 
         print("mtrr: Set range in variable MTRR number %u\n", i);
         return true;
tab: 248 wrap: offon