Changeset 0161d16 in mainline for kernel/arch/amd64/include/arch/mm/page.h

Timestamp:

2023-01-30T18:23:45Z (23 months ago)

Author:

Jakub Jermář <jakub@…>

Branches:

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

Children:

f114d40

Parents:

b1f0a14

git-author:

Colin V. Parker <cvparker@…> (2023-01-28 16:35:32)

git-committer:

Jakub Jermář <jakub@…> (2023-01-30 18:23:45)

Message:

Adjust PTE bit field definitions and sizes to match and align with 32-bit boundary.

File:

• kernel/arch/amd64/include/arch/mm/page.h (modified) (4 diffs)

kernel/arch/amd64/include/arch/mm/page.h

@@ -94 +94 @@
 #define GET_PTL1_ADDRESS_ARCH(ptl0, i) \
         ((pte_t *) ((((uint64_t) ((pte_t *) (ptl0))[(i)].addr_12_31) << 12) | \
-            (((uint64_t) ((pte_t *) (ptl0))[(i)].addr_32_51) << 32)))
+            (((uint64_t) ((pte_t *) (ptl0))[(i)].addr_32_62) << 32)))
 #define GET_PTL2_ADDRESS_ARCH(ptl1, i) \
         ((pte_t *) ((((uint64_t) ((pte_t *) (ptl1))[(i)].addr_12_31) << 12) | \
-            (((uint64_t) ((pte_t *) (ptl1))[(i)].addr_32_51) << 32)))
+            (((uint64_t) ((pte_t *) (ptl1))[(i)].addr_32_62) << 32)))
 #define GET_PTL3_ADDRESS_ARCH(ptl2, i) \
         ((pte_t *) ((((uint64_t) ((pte_t *) (ptl2))[(i)].addr_12_31) << 12) | \
-            (((uint64_t) ((pte_t *) (ptl2))[(i)].addr_32_51) << 32)))
+            (((uint64_t) ((pte_t *) (ptl2))[(i)].addr_32_62) << 32)))
 #define GET_FRAME_ADDRESS_ARCH(ptl3, i) \
         ((uintptr_t *) \
             ((((uint64_t) ((pte_t *) (ptl3))[(i)].addr_12_31) << 12) | \
-            (((uint64_t) ((pte_t *) (ptl3))[(i)].addr_32_51) << 32)))
+            (((uint64_t) ((pte_t *) (ptl3))[(i)].addr_32_62) << 32)))
 
 /* Set PTE address accessors for each level. */
@@ -155 +155 @@
 #define PTE_GET_FRAME_ARCH(p) \
         ((((uintptr_t) (p)->addr_12_31) << 12) | \
-            ((uintptr_t) (p)->addr_32_51 << 32))
+            ((uintptr_t) (p)->addr_32_62 << 32))
 #define PTE_WRITABLE_ARCH(p) \
         ((p)->writeable != 0)
@@ -202 +202 @@
         unsigned int soft_valid : 1;  /**< Valid content even if present bit is cleared. */
         unsigned int avl : 2;
-        unsigned int addr_12_31 : 30;
-        unsigned int addr_32_51 : 21;
+        unsigned int addr_12_31 : 20;
+        unsigned int addr_32_62 : 31;
         unsigned int no_execute : 1;
 } __attribute__((packed)) pte_t;
@@ -225 +225 @@
 
         p->addr_12_31 = (a >> 12) & UINT32_C(0xfffff);
-        p->addr_32_51 = a >> 32;
+        p->addr_32_62 = a >> 32;
 }