Changeset c520034 in mainline for kernel/arch/arm32/include

Timestamp:

2011-12-31T18:19:35Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

295f658, 77c2b02, 96cd5b4

Parents:

852052d (diff), 22f0561 (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:

Support for kernel non-identity mappings, phase I.

• identity/non-identity kernel memory split on all architectures
• low/high physical memory split on all architectures
• frame allocator understands low/high memory
• high physical memory currently unused (Phase II)
• more compact frame_t
• zone conf frames, pte_t, kernel stacks allocated from low memory
• lockless TLB-miss handlers everywhere (newly sparc64, ia64)
• preallocate PTL1 page tables for non-identity and prevent their deallocation
• hw_map() unification
• new resource allocator used for allocating kernel virtual addresses

Breakage:

• sparc64/sun4v creates too large kernel identity; not fixed because of lack of testing hw
• ppc32's tlb_refill() seems wrong as it creates too large kernel identity, but appears unused and the architecture works normally

Not implemented yet (phase II):

• allow high memory to be used for common kernel allocations

Location:

kernel/arch/arm32/include

Files:

• mach/integratorcp/integratorcp.h (modified) (1 diff)
• mach/testarm/testarm.h (modified) (1 diff)
• machine_func.h (modified) (2 diffs)
• mm/frame.h (modified) (1 diff)
• mm/km.h (added)
• mm/page.h (modified) (1 diff)

kernel/arch/arm32/include/mach/integratorcp/integratorcp.h

@@ -103 +103 @@
 extern void icp_cpu_halt(void);
 extern void icp_irq_exception(unsigned int, istate_t *);
-extern void icp_get_memory_extents(uintptr_t *, uintptr_t *);
+extern void icp_get_memory_extents(uintptr_t *, size_t *);
 extern void icp_frame_init(void);
 extern size_t icp_get_irq_count(void);

kernel/arch/arm32/include/mach/testarm/testarm.h

@@ -71 +71 @@
 extern void gxemul_cpu_halt(void);
 extern void gxemul_irq_exception(unsigned int, istate_t *);
-extern void gxemul_get_memory_extents(uintptr_t *, uintptr_t *);
+extern void gxemul_get_memory_extents(uintptr_t *, size_t *);
 extern void gxemul_frame_init(void);
 extern size_t gxemul_get_irq_count(void);

kernel/arch/arm32/include/machine_func.h

@@ -50 +50 @@
         void (*machine_timer_irq_start)(void);
         void (*machine_cpu_halt)(void);
-        void (*machine_get_memory_extents)(uintptr_t *, uintptr_t *);
+        void (*machine_get_memory_extents)(uintptr_t *, size_t *);
         void (*machine_irq_exception)(unsigned int, istate_t *);
         void (*machine_frame_init)(void);
@@ -81 +81 @@
  * @param size          Place to store memory size.
  */
-extern void machine_get_memory_extents(uintptr_t *start, uintptr_t *size);
+extern void machine_get_memory_extents(uintptr_t *start, size_t *size);
 
 /** Interrupt exception handler.

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

@@ -61 +61 @@
 #endif
 
-extern uintptr_t last_frame;
-
-extern void frame_arch_init(void);
+extern void frame_low_arch_init(void);
+extern void frame_high_arch_init(void);
 extern void boot_page_table_free(void);
 #define physmem_print()

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

@@ -54 +54 @@
 
 /* Number of entries in each level. */
-#define PTL0_ENTRIES_ARCH       (2 << 12)       /* 4096 */
+#define PTL0_ENTRIES_ARCH       (1 << 12)       /* 4096 */
 #define PTL1_ENTRIES_ARCH       0
 #define PTL2_ENTRIES_ARCH       0
 /* coarse page tables used (256 * 4 = 1KB per page) */
-#define PTL3_ENTRIES_ARCH       (2 << 8)        /* 256 */
+#define PTL3_ENTRIES_ARCH       (1 << 8)        /* 256 */
 
 /* Page table sizes for each level. */