Changeset 00aece0 in mainline for kernel/arch/arm32/src/mach

Timestamp:

2012-02-18T16:47:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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 mainline changes.

Location:

kernel/arch/arm32/src/mach

Files:

• gta02/gta02.c (modified) (4 diffs)
• integratorcp/integratorcp.c (modified) (5 diffs)
• testarm/testarm.c (modified) (4 diffs)

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

@@ -38 +38 @@
 #include <arch/mm/page.h>
 #include <mm/page.h>
+#include <mm/km.h>
 #include <genarch/fb/fb.h>
 #include <abi/fb/visuals.h>
@@ -65 +66 @@
 static void gta02_timer_irq_start(void);
 static void gta02_cpu_halt(void);
-static void gta02_get_memory_extents(uintptr_t *start, uintptr_t *size);
+static void gta02_get_memory_extents(uintptr_t *start, size_t *size);
 static void gta02_irq_exception(unsigned int exc_no, istate_t *istate);
 static void gta02_frame_init(void);
@@ -101 +102 @@
         s3c24xx_irqc_regs_t *irqc_regs;
 
-        gta02_timer = (void *) hw_map(S3C24XX_TIMER_ADDRESS, PAGE_SIZE);
-        irqc_regs = (void *) hw_map(S3C24XX_IRQC_ADDRESS, PAGE_SIZE);
+        gta02_timer = (void *) km_map(S3C24XX_TIMER_ADDRESS, PAGE_SIZE,
+            PAGE_NOT_CACHEABLE);
+        irqc_regs = (void *) km_map(S3C24XX_IRQC_ADDRESS, PAGE_SIZE,
+            PAGE_NOT_CACHEABLE);
 
         /* Initialize interrupt controller. */
@@ -123 +126 @@
  * @param size          Place to store memory size.
  */
-static void gta02_get_memory_extents(uintptr_t *start, uintptr_t *size)
+static void gta02_get_memory_extents(uintptr_t *start, size_t *size)
 {
         *start = GTA02_MEMORY_START + GTA02_MEMORY_SKIP;

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

@@ -45 +45 @@
 #include <mm/page.h>
 #include <mm/frame.h>
+#include <mm/km.h>
 #include <arch/mm/frame.h>
 #include <arch/mach/integratorcp/integratorcp.h>
@@ -128 +129 @@
 void icp_init(void)
 {
-        icp_hw_map.uart = hw_map(ICP_UART, PAGE_SIZE);
-        icp_hw_map.kbd_ctrl = hw_map(ICP_KBD, PAGE_SIZE);
+        icp_hw_map.uart = km_map(ICP_UART, PAGE_SIZE,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE);
+        icp_hw_map.kbd_ctrl = km_map(ICP_KBD, PAGE_SIZE, PAGE_NOT_CACHEABLE);
         icp_hw_map.kbd_stat = icp_hw_map.kbd_ctrl + ICP_KBD_STAT;
         icp_hw_map.kbd_data = icp_hw_map.kbd_ctrl + ICP_KBD_DATA;
         icp_hw_map.kbd_intstat = icp_hw_map.kbd_ctrl + ICP_KBD_INTR_STAT;
-        icp_hw_map.rtc = hw_map(ICP_RTC, PAGE_SIZE);
+        icp_hw_map.rtc = km_map(ICP_RTC, PAGE_SIZE,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE);
         icp_hw_map.rtc1_load = icp_hw_map.rtc + ICP_RTC1_LOAD_OFFSET;
         icp_hw_map.rtc1_read = icp_hw_map.rtc + ICP_RTC1_READ_OFFSET;
@@ -141 +144 @@
         icp_hw_map.rtc1_intrstat = icp_hw_map.rtc + ICP_RTC1_INTRSTAT_OFFSET;
 
-        icp_hw_map.irqc = hw_map(ICP_IRQC, PAGE_SIZE);
+        icp_hw_map.irqc = km_map(ICP_IRQC, PAGE_SIZE,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE);
         icp_hw_map.irqc_mask = icp_hw_map.irqc + ICP_IRQC_MASK_OFFSET;
         icp_hw_map.irqc_unmask = icp_hw_map.irqc + ICP_IRQC_UNMASK_OFFSET;
-        icp_hw_map.cmcr = hw_map(ICP_CMCR, PAGE_SIZE);
+        icp_hw_map.cmcr = km_map(ICP_CMCR, PAGE_SIZE,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE);
         icp_hw_map.sdramcr = icp_hw_map.cmcr + ICP_SDRAMCR_OFFSET;
-        icp_hw_map.vga = hw_map(ICP_VGA, PAGE_SIZE);
+        icp_hw_map.vga = km_map(ICP_VGA, PAGE_SIZE,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE);
 
         hw_map_init_called = true;
@@ -220 +226 @@
  * @param size          Place to store memory size.
  */
-void icp_get_memory_extents(uintptr_t *start, uintptr_t *size)
+void icp_get_memory_extents(uintptr_t *start, size_t *size)
 {
         *start = 0;
@@ -326 +332 @@
         sysinfo_set_item_val("kbd", NULL, true);
         sysinfo_set_item_val("kbd.inr", NULL, ICP_KBD_IRQ);
-        sysinfo_set_item_val("kbd.address.status", NULL,
-            (uintptr_t) icp_hw_map.kbd_stat);
-        sysinfo_set_item_val("kbd.address.data", NULL,
-            (uintptr_t) icp_hw_map.kbd_data);
+        sysinfo_set_item_val("kbd.address.physical", NULL,
+            ICP_KBD);
 
 }

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

@@ -37 +37 @@
 #include <arch/mach/testarm/testarm.h>
 #include <mm/page.h>
+#include <mm/km.h>
 #include <genarch/fb/fb.h>
 #include <abi/fb/visuals.h>
@@ -71 +72 @@
 void gxemul_init(void)
 {
-        gxemul_kbd = (void *) hw_map(GXEMUL_KBD_ADDRESS, PAGE_SIZE);
-        gxemul_rtc = (void *) hw_map(GXEMUL_RTC_ADDRESS, PAGE_SIZE);
-        gxemul_irqc = (void *) hw_map(GXEMUL_IRQC_ADDRESS, PAGE_SIZE);
+        gxemul_kbd = (void *) km_map(GXEMUL_KBD_ADDRESS, PAGE_SIZE,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE);
+        gxemul_rtc = (void *) km_map(GXEMUL_RTC_ADDRESS, PAGE_SIZE,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE);
+        gxemul_irqc = (void *) km_map(GXEMUL_IRQC_ADDRESS, PAGE_SIZE,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE);
 }
 
@@ -124 +128 @@
         sysinfo_set_item_val("kbd", NULL, true);
         sysinfo_set_item_val("kbd.inr", NULL, GXEMUL_KBD_IRQ);
-        sysinfo_set_item_val("kbd.address.virtual", NULL, (sysarg_t) gxemul_kbd);
+        sysinfo_set_item_val("kbd.address.physical", NULL,
+            GXEMUL_KBD_ADDRESS);
 #endif
 }
@@ -202 +207 @@
  * @param size          Place to store memory size.
  */
-void gxemul_get_memory_extents(uintptr_t *start, uintptr_t *size)
+void gxemul_get_memory_extents(uintptr_t *start, size_t *size)
 {
         *start = 0;
-        *size = *((uintptr_t *) (GXEMUL_MP_ADDRESS + GXEMUL_MP_MEMSIZE_OFFSET));
+        *size = *((uintptr_t *) (GXEMUL_MP_ADDRESS + GXEMUL_MP_MEMSIZE_OFFSET));
 }