Changeset 17cc8f4f in mainline

Timestamp:

2013-01-13T14:59:32Z (11 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

47bd0f8

Parents:

e1a27be (diff), b5a3b50 (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

Files:

• boot/arch/arm32/include/mm.h (modified) (1 diff)
• boot/arch/arm32/src/asm.S (modified) (1 diff)
• boot/arch/arm32/src/mm.c (modified) (3 diffs)
• kernel/arch/arm32/src/ras.c (modified) (3 diffs)

boot/arch/arm32/include/mm.h

@@ -47 +47 @@
 /** Describe "section" page table entry (one-level paging with 1 MB sized pages). */
 #define PTE_DESCRIPTOR_SECTION  0x02
+/** Shift of memory address in section descriptor */
+#define PTE_SECTION_SHIFT  20
 
 /** Page table access rights: user - no access, kernel - read/write. */
 #define PTE_AP_USER_NO_KERNEL_RW  0x01
+
+/** Start of memory mapped I/O area for GTA02 */
+#define GTA02_IOMEM_START  0x48000000
+/** End of memory mapped I/O area for GTA02 */
+#define GTA02_IOMEM_END  0x60000000
 
 /* Page table level 0 entry - "section" format is used

boot/arch/arm32/src/asm.S

@@ -60 +60 @@
         # before passing control to the copied code.
         #
+
+#if defined(MACHINE_gta02)
+
+#define CP15_C1_IC              12
+#define CP15_C1_DC              2
+#define CP15_C7_SEG_SHIFT       5
+#define CP15_C7_SEG_SIZE        3
+#define CP15_C7_IDX_SHIFT       26
+
+        # Disable I-cache and D-cache before the kernel is started.
+        mrc     p15, 0, r4, c1, c0, 0
+        bic     r4, r4, #(1 << CP15_C1_DC)
+        bic     r4, r4, #(1 << CP15_C1_IC)
+        mcr     p15, 0, r4, c1, c0, 0
+
+        # Now clean D-cache to guarantee coherency between I-cache and D-cache.
+
+        # D-cache clean and invalidate procedure.
+        # See ARM920T TRM pages 2-17, 4-17.
+
+        # Initialize segment
+        mov     r4, #0
+        # Initialize index
+1:      mov     r5, #0
+2:      orr     r6, r4, r5
+        # Clean and invalidate a single line
+        mcr     p15, 0, r6, c7, c10, 2
+        # Increment index
+        add     r5, r5, #(1 << CP15_C7_IDX_SHIFT)
+        cmp     r5, #0
+        bne     2b
+        # Increment segment
+        add     r4, #(1 << CP15_C7_SEG_SHIFT)
+        tst     r4, #(1 << (CP15_C7_SEG_SHIFT + CP15_C7_SEG_SIZE))
+        beq     1b
+#endif
+
         mov pc, r0

boot/arch/arm32/src/mm.c

@@ -38 +38 @@
 #include <arch/mm.h>
 
+/** Check if caching can be enabled for a given memory section.
+ *
+ * Memory areas used for I/O are excluded from caching.
+ * At the moment caching is enabled only on GTA02.
+ *
+ * @param section       The section number.
+ *
+ * @return      1 if the given section can be mapped as cacheable, 0 otherwise.
+*/
+static inline int section_cacheable(pfn_t section)
+{
+#ifdef MACHINE_gta02
+        unsigned long address = section << PTE_SECTION_SHIFT;
+
+        if (address >= GTA02_IOMEM_START && address < GTA02_IOMEM_END)
+                return 0;
+        else
+                return 1;
+#else
+        return 0;
+#endif
+}
+
 /** Initialize "section" page table entry.
  *
@@ -55 +78 @@
         pte->descriptor_type = PTE_DESCRIPTOR_SECTION;
         pte->bufferable = 1;
-        pte->cacheable = 0;
+        pte->cacheable = section_cacheable(frame);
         pte->xn = 0;
         pte->domain = 0;
@@ -123 +146 @@
                 "ldr r1, =0x00000005\n"
 #else
+#ifdef MACHINE_gta02
+                /* Mask to enable paging (bit 0),
+                   D-cache (bit 2), I-cache (bit 12) */
+                "ldr r1, =0x00001005\n"
+#else
                 /* Mask to enable paging */
                 "ldr r1, =0x00000001\n"
+#endif
 #endif
                 "orr r0, r0, r1\n"

kernel/arch/arm32/src/ras.c

@@ -67 +67 @@
 void ras_check(unsigned int n, istate_t *istate)
 {
-        bool restart = false;
+        bool restart_needed = false;
+        uintptr_t restart_pc = 0;
 
         if (istate_from_uspace(istate)) {
@@ -73 +74 @@
                         if ((ras_page[RAS_START] < istate->pc) &&
                             (ras_page[RAS_END] > istate->pc)) {
-                                restart = true;
+                                restart_needed = true;
+                                restart_pc = ras_page[RAS_START];
                         }
                         ras_page[RAS_START] = 0;
@@ -81 +83 @@
 
         exc_dispatch(n, istate);
-        if (restart)
-                istate->pc = ras_page[RAS_START];
+        if (restart_needed)
+                istate->pc = restart_pc;
 }