Changeset 99c2c69e in mainline for kernel/arch/sparc64/include

Timestamp:

2013-09-13T00:36:30Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

67fbd5e

Parents:

7f84430 (diff), 11d41be5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

mainline changes

Location:

kernel/arch/sparc64/include/arch

Files:

• mm/frame.h (modified) (1 diff)
• mm/sun4u/frame.h (modified) (4 diffs)
• mm/sun4v/frame.h (modified) (2 diffs)
• trap/sun4v/mmu.h (modified) (1 diff)

kernel/arch/sparc64/include/arch/mm/frame.h

@@ -46 +46 @@
 #endif
 
+#ifndef __ASM__
+
+#include <typedefs.h>
+
+extern uintptr_t end_of_identity;
+
+extern void frame_low_arch_init(void);
+extern void frame_high_arch_init(void);
+#define physmem_print()
+
+#endif
+
 #endif
 

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

@@ -27 +27 @@
  */
 
-/** @addtogroup sparc64mm       
+/** @addtogroup sparc64mm
  * @{
  */
@@ -41 +41 @@
  * Therefore, the kernel uses 8K only internally on the TLB and TSB levels.
  */
-#define MMU_FRAME_WIDTH         13      /* 8K */
-#define MMU_FRAME_SIZE          (1 << MMU_FRAME_WIDTH)
+#define MMU_FRAME_WIDTH  13  /* 8K */
+#define MMU_FRAME_SIZE   (1 << MMU_FRAME_WIDTH)
 
 /*
@@ -49 +49 @@
  * each 16K page with a pair of adjacent 8K pages.
  */
-#define FRAME_WIDTH             14      /* 16K */
-#define FRAME_SIZE              (1 << FRAME_WIDTH)
+#define FRAME_WIDTH  14  /* 16K */
+#define FRAME_SIZE   (1 << FRAME_WIDTH)
+
+#define FRAME_LOWPRIO  0
 
 #ifndef __ASM__
@@ -72 +74 @@
 typedef union frame_address frame_address_t;
 
-extern uintptr_t end_of_identity;
-
-extern void frame_low_arch_init(void);
-extern void frame_high_arch_init(void);
-#define physmem_print()
-
 #endif
 

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

@@ -27 +27 @@
  */
 
-/** @addtogroup sparc64mm       
+/** @addtogroup sparc64mm
  * @{
  */
@@ -36 +36 @@
 #define KERN_sparc64_sun4v_FRAME_H_
 
-#define MMU_FRAME_WIDTH         13      /* 8K */
-#define MMU_FRAME_SIZE          (1 << MMU_FRAME_WIDTH)
+#define MMU_FRAME_WIDTH  13  /* 8K */
+#define MMU_FRAME_SIZE   (1 << MMU_FRAME_WIDTH)
 
-#define FRAME_WIDTH             13
-#define FRAME_SIZE              (1 << FRAME_WIDTH)
+#define FRAME_WIDTH  13
+#define FRAME_SIZE   (1 << FRAME_WIDTH)
 
-#ifndef __ASM__
-
-#include <typedefs.h>
-
-extern void frame_low_arch_init(void);
-extern void frame_high_arch_init(void);
-#define physmem_print()
-
-#endif
+#define FRAME_LOWPRIO  0
 
 #endif

kernel/arch/sparc64/include/arch/trap/sun4v/mmu.h

@@ -102 +102 @@
         nop
 
+        /* exclude pages beyond the end of memory from the identity mapping */
+        sethi %hi(end_of_identity), %g4
+        ldx [%g4 + %lo(end_of_identity)], %g4
+        cmp %g1, %g4
+        bgeu %xcc, 0f
+        nop
+
         /*
          * Installing the identity does not fit into 32 instructions, call