Changeset d7ef14b in mainline

Timestamp:

2010-06-25T20:58:06Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

12b0d51

Parents:

1590e23

Message:

Link kernel to the proper base address for gta02. Change machine_get_memory_size() to machine_get_memory_extents() and trivially implement for gta02.

Location:

kernel/arch/arm32

Files:

• _link.ld.in (modified) (1 diff)
• include/machine_func.h (modified) (2 diffs)
• src/mach/gta02/gta02.c (modified) (3 diffs)
• src/mach/integratorcp/integratorcp.c (modified) (2 diffs)
• src/mach/testarm/testarm.c (modified) (2 diffs)
• src/machine_func.c (modified) (1 diff)
• src/mm/frame.c (modified) (2 diffs)

kernel/arch/arm32/_link.ld.in

@@ -7 +7 @@
  */
 
+#ifdef MACHINE_gta02
+#define KERNEL_LOAD_ADDRESS 0xb0a08000
+#else
 #define KERNEL_LOAD_ADDRESS 0x80a00000
+#endif
 
 OUTPUT_ARCH(arm)

kernel/arch/arm32/include/machine_func.h

@@ -47 +47 @@
 
 struct arm_machine_ops {
-        void            (*machine_init)(void);
-        void            (*machine_timer_irq_start)(void);
-        void            (*machine_cpu_halt)(void);
-        uintptr_t       (*machine_get_memory_size)(void);
-        void            (*machine_irq_exception)(unsigned int, istate_t*);
-        void            (*machine_frame_init)(void);
-        void            (*machine_output_init)(void);
-        void            (*machine_input_init)(void);
+        void (*machine_init)(void);
+        void (*machine_timer_irq_start)(void);
+        void (*machine_cpu_halt)(void);
+        void (*machine_get_memory_extents)(uintptr_t *, uintptr_t *);
+        void (*machine_irq_exception)(unsigned int, istate_t *);
+        void (*machine_frame_init)(void);
+        void (*machine_output_init)(void);
+        void (*machine_input_init)(void);
 };
 
@@ -74 +74 @@
 extern void machine_cpu_halt(void);
 
-
-/** 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.
  */
-extern uintptr_t machine_get_memory_size(void);
-
+extern void machine_get_memory_extents(uintptr_t *start, uintptr_t *size);
 
 /** Interrupt exception handler.

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

@@ -36 +36 @@
 #include <arch/exception.h>
 #include <arch/mach/gta02/gta02.h>
+#include <arch/mm/page.h>
+
+#define GTA02_MEMORY_START      0x30000000      /* physical */
+#define GTA02_MEMORY_SIZE       0x08000000      /* 128 MB */
+#define GTA02_MEMORY_SKIP       0x8000          /* 2 pages */
 
 static void gta02_init(void);
 static void gta02_timer_irq_start(void);
 static void gta02_cpu_halt(void);
-static uintptr_t gta02_get_memory_size(void);
+static void gta02_get_memory_extents(uintptr_t *start, uintptr_t *size);
 static void gta02_irq_exception(unsigned int exc_no, istate_t *istate);
 static void gta02_frame_init(void);
@@ -50 +55 @@
         gta02_timer_irq_start,
         gta02_cpu_halt,
-        gta02_get_memory_size,
+        gta02_get_memory_extents,
         gta02_irq_exception,
         gta02_frame_init,
@@ -69 +74 @@
 }
 
-static uintptr_t gta02_get_memory_size(void)
+/** Get extents of available memory.
+ *
+ * @param start         Place to store memory start address.
+ * @param size          Place to store memory size.
+ */
+static void gta02_get_memory_extents(uintptr_t *start, uintptr_t *size)
 {
-        return 0;
+        *start = PA2KA(GTA02_MEMORY_START) + GTA02_MEMORY_SKIP;
+        *size  = GTA02_MEMORY_SIZE - GTA02_MEMORY_SKIP;
 }
 

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_size(uintptr_t *start, uintptr_t *size)
+{
+        start = 0;
+        size = *((uintptr_t *) (GXEMUL_MP_ADDRESS + GXEMUL_MP_MEMSIZE_OFFSET));
+}
 
 /** Returns the mask of active interrupts. */

kernel/arch/arm32/src/machine_func.c

@@ -80 +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);
 }
 

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, num_frames,
             BOOT_PAGE_TABLE_START_FRAME + BOOT_PAGE_TABLE_SIZE_IN_FRAMES, 0);