Changeset 4d0f97d in mainline for kernel/arch/arm32/src

Timestamp:

2010-07-16T14:23:41Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e2650d3

Parents:

aa0d227 (diff), 24697c3 (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:

Merge from lp:~jsvoboda/helenos/gta02. This adds support for the GTA02 platform. Fixes ticket #134.

Location:

kernel/arch/arm32/src

Files:

• exc_handler.S (modified) (2 diffs)
• interrupt.c (modified) (2 diffs)
• mach/gta02/gta02.c (added)
• mach/integratorcp/integratorcp.c (modified) (2 diffs)
• mach/testarm/testarm.c (modified) (3 diffs)
• machine_func.c (modified) (4 diffs)
• mm/frame.c (modified) (2 diffs)
• mm/page.c (modified) (2 diffs)
• userspace.c (modified) (1 diff)

kernel/arch/arm32/src/exc_handler.S

@@ -96 +96 @@
         ldmfd r3!, {r4-r7}
         stmfd r13!, {r4-r7}
-        stmfd r13!, {r13, lr}^
+        mov r4, r13
+        stmfd r4, {r13, lr}^
+        nop                     /* Cannot access r13 immediately after stm(2) */
+        sub r13, r13, #8
         stmfd r13!, {r2}
 
@@ -137 +140 @@
 
         # return to user mode
-        ldmfd r13!, {r13, lr}^
+        mov r0, r13
+        ldmfd r0, {r13, lr}^
+        nop                     /* Cannot access r13 immediately after ldm(2) */
+        add r13, r13, #8
         b 2f
 

kernel/arch/arm32/src/interrupt.c

@@ -40 +40 @@
 #include <ddi/device.h>
 #include <interrupt.h>
-
-/** Initial size of a table holding interrupt handlers. */
-#define IRQ_COUNT 8
 
 /** Disable interrupts.
@@ -105 +102 @@
 void interrupt_init(void)
 {
-        irq_init(IRQ_COUNT, IRQ_COUNT);
+        size_t irq_count;
+
+        irq_count = machine_get_irq_count();
+        irq_init(irq_count, irq_count);
+
         machine_timer_irq_start();
 }

kernel/arch/arm32/src/mach/integratorcp/integratorcp.c

@@ -60 +60 @@
         icp_timer_irq_start,
         icp_cpu_halt,
-        icp_get_memory_size,
+        icp_get_memory_extents,
         icp_irq_exception,
         icp_frame_init,
@@ -214 +214 @@
 }
 
-/** Returns the size of emulated memory.
- *
- * @return Size in bytes.
- */
-size_t icp_get_memory_size(void) 
-{
+/** Get extents of available memory.
+ *
+ * @param start         Place to store memory start address.
+ * @param size          Place to store memory size.
+ */
+void icp_get_memory_extents(uintptr_t *start, uintptr_t *size)
+{
+        *start = 0;
+
         if (hw_map_init_called) {
-                return (sdram[((*(uint32_t *)icp_hw_map.sdramcr & ICP_SDRAM_MASK) >> 2)]);
+                *size = (sdram[((*(uint32_t *)icp_hw_map.sdramcr &
+                    ICP_SDRAM_MASK) >> 2)]);
         } else {
-                return SDRAM_SIZE;
-        }
-        
+                *size = SDRAM_SIZE;
+        }
 }
 

kernel/arch/arm32/src/mach/testarm/testarm.c

@@ -60 +60 @@
         gxemul_timer_irq_start,
         gxemul_cpu_halt,
-        gxemul_get_memory_size,
+        gxemul_get_memory_extents,
         gxemul_irq_exception,
         gxemul_frame_init,
@@ -185 +185 @@
 }
 
-/** Returns the size of emulated memory.
- *
- * @return Size in bytes.
- */
-uintptr_t gxemul_get_memory_size(void)
-{
-        return  *((uintptr_t *) (GXEMUL_MP_ADDRESS + GXEMUL_MP_MEMSIZE_OFFSET));
-}
-
+/** Get extents of available memory.
+ *
+ * @param start         Place to store memory start address.
+ * @param size          Place to store memory size.
+ */
+void gxemul_get_memory_extents(uintptr_t *start, uintptr_t *size)
+{
+        *start = 0;
+        *size = *((uintptr_t *) (GXEMUL_MP_ADDRESS + GXEMUL_MP_MEMSIZE_OFFSET));
+}
 
 /** Returns the mask of active interrupts. */
@@ -210 +211 @@
         unsigned int i;
 
-        for (i = 0; i < GXEMUL_IRQC_MAX_IRQ; i++) {
+        for (i = 0; i < GXEMUL_IRQ_COUNT; i++) {
                 if (sources & (1 << i)) {
                         irq_t *irq = irq_dispatch_and_lock(i);

kernel/arch/arm32/src/machine_func.c

@@ -39 +39 @@
 
 #include <arch/machine_func.h>
+#include <arch/mach/gta02/gta02.h>
 #include <arch/mach/integratorcp/integratorcp.h>
 #include <arch/mach/testarm/testarm.h>
@@ -48 +49 @@
 void machine_ops_init(void)
 {
-#if defined(MACHINE_testarm)
+#if defined(MACHINE_gta02)
+        machine_ops = &gta02_machine_ops;
+#elif defined(MACHINE_testarm)
         machine_ops = &gxemul_machine_ops;
 #elif defined(MACHINE_integratorcp)
@@ -77 +80 @@
 }
 
-
-/** Returns size of available memory.
+/** Get extents of available memory.
  *
- *  @return Size of available memory.
+ * @param start         Place to store memory start address.
+ * @param size          Place to store memory size.
  */
-uintptr_t machine_get_memory_size(void)
+void machine_get_memory_extents(uintptr_t *start, uintptr_t *size)
 {
-        return (machine_ops->machine_get_memory_size)();
+        (machine_ops->machine_get_memory_extents)(start, size);
 }
 
@@ -122 +125 @@
 }
 
+/** Get IRQ number range used by machine. */
+size_t machine_get_irq_count(void)
+{
+        size_t irq_count;
+ 
+#if defined(MACHINE_gta02)
+        irq_count = GTA02_IRQ_COUNT;
+#elif defined(MACHINE_testarm)
+        irq_count = GXEMUL_IRQ_COUNT;
+#elif defined(MACHINE_integratorcp)
+        irq_count = ICP_IRQ_COUNT;
+#else
+#error Machine type not defined.
+#endif
+        return irq_count;
+}
+
 /** @}
  */

kernel/arch/arm32/src/mm/frame.c

@@ -38 +38 @@
 #include <arch/machine_func.h>
 #include <config.h>
+#include <align.h>
 
 /** Address of the last frame in the memory. */
@@ -45 +46 @@
 void frame_arch_init(void)
 {
-        last_frame = machine_get_memory_size();
+        uintptr_t mem_start, mem_size;
+        uintptr_t first_frame;
+        uintptr_t num_frames;
+
+        machine_get_memory_extents(&mem_start, &mem_size);
+        first_frame = ALIGN_UP(mem_start, FRAME_SIZE);
+        last_frame = ALIGN_DOWN(mem_start + mem_size, FRAME_SIZE);
+        num_frames = (last_frame - first_frame) >> FRAME_WIDTH;
         
         /* All memory as one zone */
-        zone_create(0, ADDR2PFN(last_frame),
+        zone_create(first_frame >> FRAME_WIDTH, num_frames,
             BOOT_PAGE_TABLE_START_FRAME + BOOT_PAGE_TABLE_SIZE_IN_FRAMES, 0);
         

kernel/arch/arm32/src/mm/page.c

@@ -58 +58 @@
         uintptr_t cur;
         /* Kernel identity mapping */
-        for (cur = 0; cur < last_frame; cur += FRAME_SIZE)
+        for (cur = PHYSMEM_START_ADDR; cur < last_frame; cur += FRAME_SIZE)
                 page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);
         
@@ -68 +68 @@
 #error "Only high exception vector supported now"
 #endif
+        cur = ALIGN_DOWN(0x50008010, FRAME_SIZE);
+        page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);
 
         page_table_unlock(AS_KERNEL, true);

kernel/arch/arm32/src/userspace.c

@@ -97 +97 @@
                 "mov sp, %[ustate]\n"
                 "msr spsr_c, %[user_mode]\n"
-                "ldmfd sp!, {r0-r12, sp, lr}^\n"
+                "ldmfd sp, {r0-r12, sp, lr}^\n"
+                "nop\n"         /* Cannot access sp immediately after ldm(2) */
+                "add sp, sp, #(15*4)\n"
                 "ldmfd sp!, {pc}^\n"
                 :: [ustate] "r" (&ustate), [user_mode] "r" (user_mode)