Changeset 4bf0926e in mainline for kernel/arch/amd64/include

Timestamp:

2016-09-01T22:14:30Z (9 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

2c2d54a

Parents:

8b6aa39

Message:

amd64: resurrect optional support for the 'large' memory model ('kernel' memory model stays the default)

Location:

kernel/arch/amd64/include/arch/mm

Files:

• km.h (modified) (1 diff)
• page.h (modified) (2 diffs)

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

@@ -38 +38 @@
 #include <typedefs.h>
 
-#define KM_AMD64_IDENTITY_START         UINT64_C(0xffffffff80000000)
-#define KM_AMD64_IDENTITY_SIZE          UINT64_C(0x0000000080000000)
+#ifdef MEMORY_MODEL_kernel
 
-#define KM_AMD64_NON_IDENTITY_START     UINT64_C(0xffff800000000000)
-#define KM_AMD64_NON_IDENTITY_SIZE      UINT64_C(0x00007fff80000000)
+#define KM_AMD64_IDENTITY_START      UINT64_C(0xffffffff80000000)
+#define KM_AMD64_IDENTITY_SIZE       UINT64_C(0x0000000080000000)
+
+#define KM_AMD64_NON_IDENTITY_START  UINT64_C(0xffff800000000000)
+#define KM_AMD64_NON_IDENTITY_SIZE   UINT64_C(0x00007fff80000000)
+
+#endif /* MEMORY_MODEL_kernel */
+
+#ifdef MEMORY_MODEL_large
+
+#define KM_AMD64_IDENTITY_START      UINT64_C(0xffff800000000000)
+#define KM_AMD64_IDENTITY_SIZE       UINT64_C(0x0000400000000000)
+
+#define KM_AMD64_NON_IDENTITY_START  UINT64_C(0xffffc00000000000)
+#define KM_AMD64_NON_IDENTITY_SIZE   UINT64_C(0x0000400000000000)
+
+#endif /* MEMORY_MODEL_large */
 
 extern void km_identity_arch_init(void);

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

@@ -42 +42 @@
 #define PAGE_SIZE   FRAME_SIZE
 
+#ifdef MEMORY_MODEL_kernel
+
 #ifndef __ASM__
 
@@ -53 +55 @@
 
 #endif /* __ASM__ */
+
+#endif /* MEMORY_MODEL_kernel */
+
+#ifdef MEMORY_MODEL_large
+
+#ifndef __ASM__
+
+#define KA2PA(x)  (((uintptr_t) (x)) - UINT64_C(0xffff800000000000))
+#define PA2KA(x)  (((uintptr_t) (x)) + UINT64_C(0xffff800000000000))
+
+#else /* __ASM__ */
+
+#define KA2PA(x)  ((x) - 0xffff800000000000)
+#define PA2KA(x)  ((x) + 0xffff800000000000)
+
+#endif /* __ASM__ */
+
+#endif /* MEMORY_MODEL_large */
 
 /* Number of entries in each level. */