Changeset cf8e033 in rtems

Timestamp:

10/08/15 11:35:27 (7 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

27390a29

Parents:

bc820946

Message:

bsp/qoriq: Add nocache heap

Location:

c/src/lib/libbsp/powerpc/qoriq/startup

Files:

• bspstart.c (modified) (1 diff)
• linkcmds.qoriq_t2080rdb (modified) (2 diffs)
• mmu-config.c (modified) (2 diffs)

c/src/lib/libbsp/powerpc/qoriq/startup/bspstart.c

@@ -142 +142 @@
   bsp_interrupt_initialize();
 
+  rtems_cache_coherent_add_area(
+    bsp_section_nocacheheap_begin,
+    (uintptr_t) bsp_section_nocacheheap_size
+  );
+
   /* Disable boot page translation */
 #if QORIQ_CHIP_IS_T_VARIANT(QORIQ_CHIP_VARIANT)

c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_t2080rdb

@@ -6 +6 @@
 
 MEMORY {
-        LOW : ORIGIN = 0x4000, LENGTH = 16M - 16k
-        HIGH : ORIGIN = 0x1000000, LENGTH = 2048M - 16M
-        EMPTY : ORIGIN = 0x0, LENGTH = 0
+        LOW     : ORIGIN = 0x00004000, LENGTH = 16M - 16k
+        NOCACHE : ORIGIN = 0x01000000, LENGTH = 16M
+        HIGH    : ORIGIN = 0x02000000, LENGTH = 2048M - 32M
+        EMPTY   : ORIGIN = 0x00000000, LENGTH = 0
 }
 
@@ -26 +27 @@
 REGION_ALIAS ("REGION_WORK", HIGH);
 REGION_ALIAS ("REGION_STACK", HIGH);
-REGION_ALIAS ("REGION_NOCACHE", EMPTY);
-REGION_ALIAS ("REGION_NOCACHE_LOAD", EMPTY);
+REGION_ALIAS ("REGION_NOCACHE", NOCACHE);
+REGION_ALIAS ("REGION_NOCACHE_LOAD", LOW);
 REGION_ALIAS ("REGION_NVRAM", EMPTY);
 

c/src/lib/libbsp/powerpc/qoriq/startup/mmu-config.c

@@ -64 +64 @@
 }
 
+#define ENTRY_IO(b, s) { \
+        .begin = (uint32_t) b, \
+        .size = (uint32_t) s, \
+        .mas2 = FSL_EIS_MAS2_I | FSL_EIS_MAS2_G, \
+        .mas3 = FSL_EIS_MAS3_SR | FSL_EIS_MAS3_SW \
+}
+
 #define ENTRY_DEV(b, s) { \
         .begin = (uint32_t) b, \
@@ -104 +111 @@
         ENTRY_RW(bsp_section_work_begin, bsp_section_work_size),
         ENTRY_RW(bsp_section_stack_begin, bsp_section_stack_size),
+        ENTRY_IO(bsp_section_nocache_begin, bsp_section_nocache_size),
+        ENTRY_IO(bsp_section_nocacheheap_begin, bsp_section_nocacheheap_size),
 #if QORIQ_CHIP_IS_T_VARIANT(QORIQ_CHIP_VARIANT)
         /* BMan Portals */