Changeset 316

Timestamp:

Aug 3, 2017, 12:01:19 PM (7 years ago)

Author:

max@…

Message:

Synchronize with Alain's changes. Still several issues.

Location:

trunk/hal/x86_64/core

Files:

• hal_gpt.c (modified) (3 diffs)
• hal_types.h (modified) (1 diff)

trunk/hal/x86_64/core/hal_gpt.c

@@ -257 +257 @@
 {
         page_t *page;
+        xptr_t page_xp;
 
         /* check page size */
@@ -276 +277 @@
         }
 
+        /*
+         * XXX XXX XXX: can kmem_alloc allocate the page in a remote cluster??
+         */
+        page_xp = XPTR(local_cxy, page);
+
         /* populate the kernel entries */
         pt_entry_t *L4src, *L4dst;
@@ -281 +287 @@
         vaddr_t L4vaddr = L4paddr + KERNBASE; // XXX
         L4src = (pt_entry_t *)L4vaddr;
-        L4dst = (pt_entry_t *)ppm_page2vaddr(page);
+        L4dst = (pt_entry_t *)ppm_page2base(page_xp);
         memcpy(&L4dst[256], &L4src[256], 256 * sizeof(pt_entry_t));
-        L4dst[L4_SLOT_PTE] = (ppm_page2ppn(page) >> CONFIG_PPM_PAGE_SHIFT) |
+        L4dst[L4_SLOT_PTE] = (ppm_page2ppn(page_xp) >> CONFIG_PPM_PAGE_SHIFT) |
             PG_V | PG_KW | PG_NX;
 
         /* initialize generic page table descriptor */
-        gpt->ptr  = ppm_page2vaddr(page);
-        gpt->ppn  = ppm_page2ppn(page);
-        gpt->page = page;
+        gpt->ptr  = GET_PTR(ppm_page2base(page_xp));
+        gpt->ppn  = ppm_page2ppn(page_xp);
+        gpt->page = GET_PTR(page_xp);
 
         /* initialize PTE entries attributes masks */

trunk/hal/x86_64/core/hal_types.h

@@ -217 +217 @@
 #define LPA_SHIFT              33
 #define CXY_FROM_PADDR(paddr)  ((cxy_t)((paddr) >> LPA_SHIFT))
-#define LPA_FROM_PADDR(paddr)  (lpa_t)((paddr & LPA_MASK)
+#define LPA_FROM_PADDR(paddr)  (lpa_t)(paddr & LPA_MASK)
 #define PADDR(cxy,lpa)         (((uint64_t)(cxy) << LPA_SHIFT) | (((uint64_t)(lpa)) & LPA_MASK))