Changeset 4687a26c in mainline for kernel/arch/mips32

Timestamp:

2010-11-02T18:29:01Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4f35b9ff

Parents:

76e1121f (diff), 28f4adb (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.

Location:

kernel/arch/mips32

Files:

• include/cp0.h (modified) (1 diff)
• include/exception.h (modified) (2 diffs)
• include/istate.h (added)
• include/smp/dorder.h (moved) (moved from uspace/lib/net/include/netif_nil_bundle.h ) (2 diffs)
• src/interrupt.c (modified) (4 diffs)
• src/smp/dorder.c (modified) (1 diff)

kernel/arch/mips32/include/cp0.h

@@ -36 +36 @@
 #define KERN_mips32_CP0_H_
 
+#ifdef KERNEL
 #include <typedefs.h>
+#else
+#include <sys/types.h>
+#endif
 
 #define cp0_status_ie_enabled_bit     (1 << 0)

kernel/arch/mips32/include/exception.h

@@ -37 +37 @@
 
 #include <typedefs.h>
-#include <arch/cp0.h>
-#include <trace.h>
+#include <arch/istate.h>
 
 #define EXC_Int    0
@@ -59 +58 @@
 #define EXC_VCED   31
 
-typedef struct istate {
-        /*
-         * The first seven registers are arranged so that the istate structure
-         * can be used both for exception handlers and for the syscall handler.
-         */
-        uint32_t a0;    /* arg1 */
-        uint32_t a1;    /* arg2 */
-        uint32_t a2;    /* arg3 */
-        uint32_t a3;    /* arg4 */
-        uint32_t t0;    /* arg5 */
-        uint32_t t1;    /* arg6 */
-        uint32_t v0;    /* arg7 */
-        uint32_t v1;
-        uint32_t at;
-        uint32_t t2;
-        uint32_t t3;
-        uint32_t t4;
-        uint32_t t5;
-        uint32_t t6;
-        uint32_t t7;
-        uint32_t s0;
-        uint32_t s1;
-        uint32_t s2;
-        uint32_t s3;
-        uint32_t s4;
-        uint32_t s5;
-        uint32_t s6;
-        uint32_t s7;
-        uint32_t t8;
-        uint32_t t9;
-        uint32_t kt0;
-        uint32_t kt1;   /* We use it as thread-local pointer */
-        uint32_t gp;
-        uint32_t sp;
-        uint32_t s8;
-        uint32_t ra;
-        
-        uint32_t lo;
-        uint32_t hi;
-        
-        uint32_t status;        /* cp0_status */
-        uint32_t epc;           /* cp0_epc */
-
-        uint32_t alignment;     /* to make sizeof(istate_t) a multiple of 8 */
-} istate_t;
-
-NO_TRACE static inline void istate_set_retaddr(istate_t *istate,
-    uintptr_t retaddr)
-{
-        istate->epc = retaddr;
-}
-
-/** Return true if exception happened while in userspace */
-NO_TRACE static inline int istate_from_uspace(istate_t *istate)
-{
-        return istate->status & cp0_status_um_bit;
-}
-
-NO_TRACE static inline unative_t istate_get_pc(istate_t *istate)
-{
-        return istate->epc;
-}
-
-NO_TRACE static inline unative_t istate_get_fp(istate_t *istate)
-{
-        return istate->sp;
-}
-
 extern void exception(istate_t *istate);
 extern void tlb_refill_entry(void);

kernel/arch/mips32/include/smp/dorder.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Martin Decky
+ * Copyright (c) 2007 Martin Decky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup netif_standalone
- *  @{
+/** @addtogroup mips32
+ * @{
+ */
+/** @file
  */
 
-#ifndef __NETIF_NIL_BUNDLE_H__
-#define __NETIF_NIL_BUNDLE_H__
+#ifndef KERN_mips32_DORDER_H_
+#define KERN_mips32_DORDER_H_
 
-#include <ipc/ipc.h>
-#include <async.h>
+#include <typedefs.h>
 
-extern int netif_nil_module_message(const char *, ipc_callid_t, ipc_call_t *,
-    ipc_call_t *, int *);
-extern int netif_nil_module_start(async_client_conn_t);
+extern uint32_t dorder_cpuid(void);
+extern void dorder_ipi_ack(uint32_t);
 
 #endif

kernel/arch/mips32/src/interrupt.c

@@ -38 +38 @@
 #include <arch.h>
 #include <arch/cp0.h>
+#include <arch/smp/dorder.h>
 #include <time/clock.h>
 #include <ipc/sysipc.h>
@@ -48 +49 @@
 function virtual_timer_fnc = NULL;
 static irq_t timer_irq;
+static irq_t dorder_irq;
 
 // TODO: This is SMP unsafe!!!
@@ -149 +151 @@
 }
 
+static irq_ownership_t dorder_claim(irq_t *irq)
+{
+        return IRQ_ACCEPT;
+}
+
+static void dorder_irq_handler(irq_t *irq)
+{
+        dorder_ipi_ack(1 << dorder_cpuid());
+}
+
 /* Initialize basic tables for exception dispatching */
 void interrupt_init(void)
@@ -163 +175 @@
         timer_start();
         cp0_unmask_int(TIMER_IRQ);
+        
+        irq_initialize(&dorder_irq);
+        dorder_irq.devno = device_assign_devno();
+        dorder_irq.inr = DORDER_IRQ;
+        dorder_irq.claim = dorder_claim;
+        dorder_irq.handler = dorder_irq_handler;
+        irq_register(&dorder_irq);
+        
+        cp0_unmask_int(DORDER_IRQ);
 }
 

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
 
-#define MSIM_DORDER_ADDRESS  0xB0000004
-
 void ipi_broadcast_arch(int ipi)
 {
-        *((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;
+}
+
 /** @}
  */