Changeset 46c20c8 in mainline for kernel/arch/mips32/src/smp/dorder.c

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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.

File:

• kernel/arch/mips32/src/smp/dorder.c (modified) (1 diff)

kernel/arch/mips32/src/smp/dorder.c

@@ -33 +33 @@
  */
 
+#include <typedefs.h>
+#include <smp/ipi.h>
 #include <arch/smp/dorder.h>
 
 #define MSIM_DORDER_ADDRESS  0xB0000004
 
+#ifdef CONFIG_SMP
+
 void ipi_broadcast_arch(int ipi)
 {
-#ifdef CONFIG_SMP
-        *((volatile unsigned int *) MSIM_DORDER_ADDRESS) = 0x7FFFFFFF;
+        *((volatile uint32_t *) MSIM_DORDER_ADDRESS) = 0x7fffffff;
+}
+
 #endif
+
+uint32_t dorder_cpuid(void)
+{
+        return *((volatile uint32_t *) MSIM_DORDER_ADDRESS);
+}
+
+void dorder_ipi_ack(uint32_t mask)
+{
+        *((volatile uint32_t *) (MSIM_DORDER_ADDRESS + 4)) = mask;
 }