Changeset 7cb567cd in mainline for kernel/arch/ia32/src/mm/page.c

Timestamp:

2007-04-08T20:52:53Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e5dbbe5

Parents:

328f324b

Message:

map kernel pages explicitly as writable (this solves compatibility issues with Intel Core 2)
make VESA framebuffer initialization more robust

File:

• kernel/arch/ia32/src/mm/page.c (modified) (5 diffs)

kernel/arch/ia32/src/mm/page.c

@@ -62 +62 @@
                  */
                 for (cur = 0; cur < last_frame; cur += FRAME_SIZE) {
-                        flags = PAGE_CACHEABLE;
+                        flags = PAGE_CACHEABLE | PAGE_WRITE;
                         if ((PA2KA(cur) >= config.base) && (PA2KA(cur) < config.base + config.kernel_size))
                                 flags |= PAGE_GLOBAL;
@@ -70 +70 @@
                 exc_register(14, "page_fault", (iroutine) page_fault);
                 write_cr3((uintptr_t) AS_KERNEL->genarch.page_table);
-        }
-        else {
+        } else
                 write_cr3((uintptr_t) AS_KERNEL->genarch.page_table);
-        }
 
         paging_on();
@@ -87 +85 @@
         pfn_t i;
         for (i = 0; i < ADDR2PFN(ALIGN_UP(size, PAGE_SIZE)); i++)
-                page_mapping_insert(AS_KERNEL, virtaddr + PFN2ADDR(i), physaddr + PFN2ADDR(i), PAGE_NOT_CACHEABLE);
+                page_mapping_insert(AS_KERNEL, virtaddr + PFN2ADDR(i), physaddr + PFN2ADDR(i), PAGE_NOT_CACHEABLE | PAGE_WRITE);
         
         last_frame = ALIGN_UP(last_frame + size, FRAME_SIZE);
@@ -96 +94 @@
 void page_fault(int n, istate_t *istate)
 {
-        uintptr_t page;
+        uintptr_t page;
         pf_access_t access;
         
-        page = read_cr2();
+        page = read_cr2();
                 
-        if (istate->error_word & PFERR_CODE_RSVD)
+        if (istate->error_word & PFERR_CODE_RSVD)
                 panic("Reserved bit set in page directory.\n");
 
@@ -108 +106 @@
         else
                 access = PF_ACCESS_READ;
-
-        if (as_page_fault(page, access, istate) == AS_PF_FAULT) {
+        
+        if (as_page_fault(page, access, istate) == AS_PF_FAULT) {
                 fault_if_from_uspace(istate, "Page fault: %#x", page);
-
-                decode_istate(istate);
-                printf("page fault address: %#x\n", page);
-                panic("page fault\n");
-        }
+                
+                decode_istate(istate);
+                printf("page fault address: %#x\n", page);
+                panic("page fault\n");
+        }
 }