Changeset 0abc2ae in mainline for kernel/arch/mips32

Timestamp:

2018-08-13T00:11:39Z (7 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

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

Children:

f34d2be

Parents:

05882233

Message:

Remove single-argument version of smc_coherence.

Location:

kernel/arch/mips32

Files:

• include/arch/barrier.h (modified) (1 diff)
• src/debugger.c (modified) (4 diffs)
• src/mips32.c (modified) (1 diff)

kernel/arch/mips32/include/arch/barrier.h

@@ -48 +48 @@
 #ifdef KERNEL
 
-#define smc_coherence(a)
-#define smc_coherence_block(a, l)
+#define smc_coherence(a, l)
 
 #endif  /* KERNEL */

kernel/arch/mips32/src/debugger.c

@@ -213 +213 @@
         /* Set breakpoint */
         *((sysarg_t *) cur->address) = 0x0d;
-        smc_coherence(cur->address);
+        smc_coherence(cur->address, 4);
 
         irq_spinlock_unlock(&bkpoint_lock, true);
@@ -246 +246 @@
 
         ((uint32_t *) cur->address)[0] = cur->instruction;
-        smc_coherence(((uint32_t *) cur->address)[0]);
+        smc_coherence(((uint32_t *) cur->address)[0], 4);
         ((uint32_t *) cur->address)[1] = cur->nextinstruction;
-        smc_coherence(((uint32_t *) cur->address)[1]);
+        smc_coherence(((uint32_t *) cur->address)[1], 4);
 
         cur->address = (uintptr_t) NULL;
@@ -358 +358 @@
                         /* Set breakpoint on first instruction */
                         ((uint32_t *) cur->address)[0] = 0x0d;
-                        smc_coherence(((uint32_t *)cur->address)[0]);
+                        smc_coherence(((uint32_t *)cur->address)[0], 4);
 
                         /* Return back the second */
                         ((uint32_t *) cur->address)[1] = cur->nextinstruction;
-                        smc_coherence(((uint32_t *) cur->address)[1]);
+                        smc_coherence(((uint32_t *) cur->address)[1], 4);
 
                         cur->flags &= ~BKPOINT_REINST;
@@ -380 +380 @@
                 /* Return first instruction back */
                 ((uint32_t *)cur->address)[0] = cur->instruction;
-                smc_coherence(cur->address);
+                smc_coherence(cur->address, 4);
 
                 if (!(cur->flags & BKPOINT_ONESHOT)) {

kernel/arch/mips32/src/mips32.c

@@ -121 +121 @@
         /* Copy the exception vectors to the right places */
         memcpy(TLB_EXC, (char *) tlb_refill_entry, EXCEPTION_JUMP_SIZE);
-        smc_coherence_block(TLB_EXC, EXCEPTION_JUMP_SIZE);
+        smc_coherence(TLB_EXC, EXCEPTION_JUMP_SIZE);
         memcpy(NORM_EXC, (char *) exception_entry, EXCEPTION_JUMP_SIZE);
-        smc_coherence_block(NORM_EXC, EXCEPTION_JUMP_SIZE);
+        smc_coherence(NORM_EXC, EXCEPTION_JUMP_SIZE);
         memcpy(CACHE_EXC, (char *) cache_error_entry, EXCEPTION_JUMP_SIZE);
-        smc_coherence_block(CACHE_EXC, EXCEPTION_JUMP_SIZE);
+        smc_coherence(CACHE_EXC, EXCEPTION_JUMP_SIZE);
 
         /*