Changeset 72bf0d2 in mainline for kernel/arch/sparc64/src

Timestamp:

2010-02-22T21:24:19Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

850987d

Parents:

61001a9 (diff), f8f7dba (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 from lp:~rimskyp/helenos/sparc.
Fix non-SMP build on sun4v.
Minor cleanup.

Location:

kernel/arch/sparc64/src

Files:

• cpu/sun4v/cpu.c (modified) (3 diffs)
• smp/sun4u/ipi.c (moved) (moved from kernel/arch/sparc64/src/smp/ipi.c ) (2 diffs)
• smp/sun4u/smp.c (moved) (moved from kernel/arch/sparc64/src/smp/smp.c ) (1 diff)
• smp/sun4v/ipi.c (added)
• smp/sun4v/smp.c (added)
• trap/interrupt.c (modified) (3 diffs)
• trap/sun4u/interrupt.c (added)
• trap/sun4v/interrupt.c (added)
• trap/sun4v/trap_table.S (modified) (2 diffs)

kernel/arch/sparc64/src/cpu/sun4v/cpu.c

@@ -41 +41 @@
 #include <arch/sun4v/md.h>
 #include <arch/sun4v/hypercall.h>
-
-//#include <arch/trap/sun4v/interrupt.h>
+#include <arch/trap/sun4v/interrupt.h>
 
 /** Perform sparc64 specific initialization of the processor structure for the
@@ -74 +73 @@
                 
         tick_init();
-        //MH - uncomment later
-        //sun4v_ipi_init();
+
+        sun4v_ipi_init();
 }
 
@@ -96 +95 @@
 {
         printf("cpu%d: Niagara (%d MHz)\n", m->id,
-                m->arch.clock_frequency / 1000000);
+            m->arch.clock_frequency / 1000000);
 }
 

kernel/arch/sparc64/src/smp/sun4u/ipi.c

@@ -99 +99 @@
         status = asi_u64_read(ASI_INTR_DISPATCH_STATUS, 0);
         if (status & INTR_DISPATCH_STATUS_BUSY)
-                panic("Interrupt Dispatch Status busy bit set.");
+                panic("Interrupt Dispatch Status busy bit set\n");
         
         ASSERT(!(pstate_read() & PSTATE_IE_BIT));
@@ -152 +152 @@
                 break;
         default:
-                panic("Unknown IPI (%d).", ipi);
+                panic("Unknown IPI (%d).\n", ipi);
                 break;
         }

kernel/arch/sparc64/src/smp/sun4u/smp.c

@@ -62 +62 @@
 {
         ofw_tree_node_t *node;
-        size_t cnt = 0;
+        unsigned int cnt = 0;
         
         if (is_us() || is_us_iii()) {

kernel/arch/sparc64/src/trap/interrupt.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2005 Jakub Jermar
+ * Copyright (c) 2009 Pavel Rimsky
  * All rights reserved.
  *
@@ -34 +35 @@
 
 #include <arch/interrupt.h>
+#include <arch/trap/interrupt.h>
 #include <arch/sparc64.h>
-#include <arch/trap/interrupt.h>
 #include <interrupt.h>
 #include <ddi/irq.h>
@@ -60 +61 @@
         exc_register(n - 1, name, f);
 }
-
-/** Process hardware interrupt.
- *
- * @param n Ignored.
- * @param istate Ignored.
- */
-void interrupt(int n, istate_t *istate)
-{
-        uint64_t status;
-        uint64_t intrcv;
-        uint64_t data0;
-        status = asi_u64_read(ASI_INTR_DISPATCH_STATUS, 0);
-        if (status & (!INTR_DISPATCH_STATUS_BUSY))
-                panic("Interrupt Dispatch Status busy bit not set.");
-
-        intrcv = asi_u64_read(ASI_INTR_RECEIVE, 0);
-#if defined (US)
-        data0 = asi_u64_read(ASI_INTR_R, ASI_UDB_INTR_R_DATA_0);
-#elif defined (US3)
-        data0 = asi_u64_read(ASI_INTR_R, VA_INTR_R_DATA_0);
-#endif
-
-        irq_t *irq = irq_dispatch_and_lock(data0);
-        if (irq) {
-                /*
-                 * The IRQ handler was found.
-                 */
-                irq->handler(irq);
-                /*
-                 * See if there is a clear-interrupt-routine and call it.
-                 */
-                if (irq->cir) {
-                        irq->cir(irq->cir_arg, irq->inr);
-                }
-                spinlock_unlock(&irq->lock);
-        } else if (data0 > config.base) {
-                /*
-                 * This is a cross-call.
-                 * data0 contains address of the kernel function.
-                 * We call the function only after we verify
-                 * it is one of the supported ones.
-                 */
-#ifdef CONFIG_SMP
-                if (data0 == (uintptr_t) tlb_shootdown_ipi_recv) {
-                        tlb_shootdown_ipi_recv();
-                }
-#endif
-        } else {
-                /*
-                 * Spurious interrupt.
-                 */
-#ifdef CONFIG_DEBUG
-                printf("cpu%u: spurious interrupt (intrcv=%#" PRIx64
-                    ", data0=%#" PRIx64 ")\n", CPU->id, intrcv, data0);
-#endif
-        }
-
-        membar();
-        asi_u64_write(ASI_INTR_RECEIVE, 0, 0);
-}
-
 /** @}
  */

kernel/arch/sparc64/src/trap/sun4v/trap_table.S

@@ -344 +344 @@
 .global cpu_mondo_handler_tl0
 cpu_mondo_handler_tl0:
-/* PREEMPTIBLE_HANDLER cpu_mondo */
+PREEMPTIBLE_HANDLER cpu_mondo
 
 /* TT = 0x80, TL = 0, spill_0_normal handler */
@@ -533 +533 @@
 cpu_mondo_handler_tl1:
         wrpr %g0, %tl
-/*      PREEMPTIBLE_HANDLER cpu_mondo */
+        PREEMPTIBLE_HANDLER cpu_mondo
 
 /* TT = 0x80, TL > 0, spill_0_normal handler */