Changeset ec1c8e6 in mainline

Timestamp:

2011-11-09T00:06:57Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ddcc8a0

Parents:

6641295

Message:

Partition sparc64 kernel memory.

Location:

kernel/arch/sparc64

Files:

• include/mm/sun4u/km.h (modified) (1 diff)
• include/mm/sun4v/km.h (modified) (1 diff)
• src/mm/sun4u/km.c (modified) (1 diff)
• src/mm/sun4v/km.c (modified) (1 diff)

kernel/arch/sparc64/include/mm/sun4u/km.h

@@ -36 +36 @@
 #define KERN_sparc64_sun4u_KM_H_
 
+/*
+ * Be conservative and assume the 44-bit virtual address width as found
+ * on the UltraSPARC CPU, even when running on a newer CPU, such as
+ * UltraSPARC III, which has the full 64-bit virtual address width.
+ *
+ * Do not use the 4 GiB area on either side of the VA hole to meet the
+ * limitations of the UltraSPARC CPU.
+ */
+
+#define KM_SPARC64_US_IDENTITY_START            UINT64_C(0x0000000000000000)
+#define KM_SPARC64_US_IDENTITY_SIZE             UINT64_C(0x000007ff00000000)
+
+#define KM_SPARC64_US_NON_IDENTITY_START        UINT64_C(0xfffff80100000000)
+#define KM_SPARC64_US_NON_IDENTITY_SIZE         UINT64_C(0x000007ff00000000)
+
 extern void km_identity_arch_init(void);
 extern void km_non_identity_arch_init(void);

kernel/arch/sparc64/include/mm/sun4v/km.h

@@ -36 +36 @@
 #define KERN_sparc64_sun4v_KM_H_
 
+/*
+ * Do not use the 4 GiB area on either side of the VA hole to meet the
+ * limitations of the UltraSPARC T1 CPU.
+ */
+
+#define KM_SPARC64_T1_IDENTITY_START            UINT64_C(0x0000000000000000)
+#define KM_SPARC64_T1_IDENTITY_SIZE             UINT64_C(0x00007fff00000000)
+
+#define KM_SPARC64_T1_NON_IDENTITY_START        UINT64_C(0xffff800100000000)
+#define KM_SPARC64_T1_NON_IDENTITY_SIZE         UINT64_C(0x00007fff00000000)
+
 extern void km_identity_arch_init(void);
 extern void km_non_identity_arch_init(void);

kernel/arch/sparc64/src/mm/sun4u/km.c

@@ -32 +32 @@
 
 #include <arch/mm/km.h>
+#include <mm/km.h>
+#include <config.h>
 
 void km_identity_arch_init(void)
 {
+        config.identity_base = KM_SPARC64_US_IDENTITY_START;
+        config.identity_size = KM_SPARC64_US_IDENTITY_SIZE;
 }
 
 void km_non_identity_arch_init(void)
 {
+        km_non_identity_span_add(KM_SPARC64_US_NON_IDENTITY_START,
+            KM_SPARC64_US_NON_IDENTITY_SIZE);
 }
 

kernel/arch/sparc64/src/mm/sun4v/km.c

@@ -32 +32 @@
 
 #include <arch/mm/km.h>
+#include <mm/km.h>
+#include <config.h>
 
 void km_identity_arch_init(void)
 {
+        config.identity_base = KM_SPARC64_T1_IDENTITY_START;
+        config.identity_size = KM_SPARC64_T1_IDENTITY_SIZE;
 }
 
 void km_non_identity_arch_init(void)
 {
+        km_non_identity_span_add(KM_SPARC64_T1_NON_IDENTITY_START,
+            KM_SPARC64_T1_NON_IDENTITY_SIZE);
 }