Changeset 83 for trunk/hal/x86_64

Timestamp:

Jun 28, 2017, 1:39:05 PM (8 years ago)

Author:

max@…

Message:

we want to have the LAPIC non-cacheable

Location:

trunk/hal/x86_64/core

Files:

• hal_apic.c (modified) (2 diffs)
• hal_gpt.c (modified) (8 diffs)
• hal_internal.h (modified) (1 diff)

trunk/hal/x86_64/core/hal_apic.c

@@ -21 +21 @@
 
 #include <hal_types.h>
+#include <hal_boot.h>
 #include <hal_register.h>
 #include <hal_segmentation.h>
@@ -91 +92 @@
         wrmsr(MSR_APICBASE, lapic_pa | APICBASE_EN);
 
-        hal_gpt_enter(lapic_va, lapic_pa);
+        hal_gpt_enter(lapic_va, lapic_pa, PG_V|PG_KW|PG_NX|PG_N);
 
         hal_lapic_write(LAPIC_TPR, 0);

trunk/hal/x86_64/core/hal_gpt.c

@@ -75 +75 @@
 }
 
-void hal_gpt_enter(vaddr_t va, paddr_t pa)
+void hal_gpt_enter(vaddr_t va, paddr_t pa, pt_entry_t flags)
 {
         XASSERT(va % PAGE_SIZE == 0);
         XASSERT(pa % PAGE_SIZE == 0);
         XASSERT(va == tmpva || PTE_BASE[pl1_i(va)] == 0);
-        PTE_BASE[pl1_i(va)] = (pa & PG_FRAME) | PG_V | PG_KW | PG_NX;
+        PTE_BASE[pl1_i(va)] = (pa & PG_FRAME) | flags;
         invlpg(va);
 }
@@ -86 +86 @@
 void hal_gpt_enter_range(vaddr_t va, paddr_t pa, size_t n)
 {
+        pt_entry_t flags = PG_V | PG_KW | PG_NX;
         size_t i;
         for (i = 0; i < n; i++) {
-                hal_gpt_enter(va + i * PAGE_SIZE, pa + i * PAGE_SIZE);
+                hal_gpt_enter(va + i * PAGE_SIZE, pa + i * PAGE_SIZE, flags);
         }
 }
@@ -116 +117 @@
 void hal_gpt_maptree_area(vaddr_t va_start, vaddr_t va_end)
 {
+        pt_entry_t flags = PG_V| PG_KW | PG_NX;
         size_t L4start, L4end, nL4e;
         size_t L3start, L3end, nL3e;
@@ -145 +147 @@
         for (i = 0; i < nL2e; i++) {
                 pa = L1page + i * PAGE_SIZE;
-                hal_gpt_enter(tmpva, pa);
+                hal_gpt_enter(tmpva, pa, flags);
 
                 memset((void *)tmpva, 0, PAGE_SIZE);
@@ -153 +155 @@
         for (i = 0; i < nL3e; i++) {
                 pa = L2page + i * PAGE_SIZE;
-                hal_gpt_enter(tmpva, pa);
+                hal_gpt_enter(tmpva, pa, flags);
 
                 memset((void *)tmpva, 0, PAGE_SIZE);
@@ -161 +163 @@
         for (i = 0; i < nL4e; i++) {
                 pa = L3page + i * PAGE_SIZE;
-                hal_gpt_enter(tmpva, pa);
+                hal_gpt_enter(tmpva, pa, flags);
 
                 memset((void *)tmpva, 0, PAGE_SIZE);
@@ -172 +174 @@
                 pa -= npa;      /* shift on the left */
                 pa &= PG_FRAME; /* rounddown to a page boundary */
-                hal_gpt_enter(tmpva, pa);
+                hal_gpt_enter(tmpva, pa, flags);
 
                 pde = (pt_entry_t *)tmpva;
@@ -185 +187 @@
                 pa -= npa;      /* shift on the left */
                 pa &= PG_FRAME; /* rounddown to a page boundary */
-                hal_gpt_enter(tmpva, pa);
+                hal_gpt_enter(tmpva, pa, flags);
 
                 pde = (pt_entry_t *)tmpva;

trunk/hal/x86_64/core/hal_internal.h

@@ -43 +43 @@
 vaddr_t hal_gpt_bootstrap_valloc(size_t npages);
 void hal_gpt_bootstrap_reset();
-void hal_gpt_enter(vaddr_t va, paddr_t pa);
+void hal_gpt_enter(vaddr_t va, paddr_t pa, pt_entry_t flags);
 void hal_gpt_enter_range(vaddr_t va, paddr_t pa, size_t n);
 void hal_gpt_leave(vaddr_t va);