Changeset 3759681 in mainline

Timestamp:

2008-06-14T16:26:14Z (17 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

0af4f9e

Parents:

62cd66f

Message:

Implement smc_coherence[_block]() for ppc32

Location:

kernel

Files:

• arch/ppc32/include/barrier.h (modified) (1 diff)
• generic/src/mm/backend_elf.c (modified) (2 diffs)

kernel/arch/ppc32/include/barrier.h

@@ -43 +43 @@
 #define write_barrier() asm volatile ("eieio" ::: "memory")
 
-#define smc_coherence(a)
-#define smc_coherence_block(a, l)
+/*
+ * The IMB sequence used here is valid for all possible cache models
+ * on uniprocessor. SMP might require a different sequence.
+ * See PowerPC Programming Environment for 32-Bit Microprocessors,
+ * chapter 5.1.5.2
+ */
+
+static inline void smc_coherence(void *addr)
+{
+        asm volatile (
+                "dcbst 0, %0\n"
+                "sync\n"
+                "icbi 0, %0\n"
+                "isync\n"
+                :: "r" (addr)
+        );
+}
+
+#define COHERENCE_INVAL_MIN     4
+
+static inline void smc_coherence_block(void *addr, unsigned long len)
+{
+        unsigned long i;
+
+        for (i = 0; i < len; i += COHERENCE_INVAL_MIN) {
+                asm volatile ("dcbst 0, %0\n" :: "r" (addr + i));
+        }
+
+        asm volatile ("sync");
+
+        for (i = 0; i < len; i += COHERENCE_INVAL_MIN) {
+                asm volatile ("icbi 0, %0\n" :: "r" (addr + i));
+        }
+
+        asm volatile ("isync");
+}
 
 #endif

kernel/generic/src/mm/backend_elf.c

@@ -154 +154 @@
                             (void *) (base + i * FRAME_SIZE), FRAME_SIZE);
                         if (entry->p_flags & PF_X) {
-                                smc_coherence_block(PA2KA(frame), FRAME_SIZE);
+                                smc_coherence_block((void *) PA2KA(frame),
+                                    FRAME_SIZE);
                         }
                         dirty = true;
@@ -194 +195 @@
                     FRAME_SIZE - pad_lo - pad_hi);
                 if (entry->p_flags & PF_X) {
-                        smc_coherence_block(PA2KA(frame) + pad_lo, FRAME_SIZE -
-                            pad_lo - pad_hi);
+                        smc_coherence_block((void *) (PA2KA(frame) + pad_lo), 
+                            FRAME_SIZE - pad_lo - pad_hi);
                 }
                 memsetb((void *) PA2KA(frame), pad_lo, 0);