Changeset f9a56c0 in mainline for kernel/arch/sparc64/src

Timestamp:

2006-08-17T11:39:38Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ee289cf0

Parents:

ec2c55a

Message:

sparc64 work.
interrupt_vector trap experimental handling.
Minimal reverse-engineered FireHose Controller driver (documentation needed!).
Keyboard on Sun Enterprise is now interrupt driven. Keyboard on Sun Ultra
is still polled.

Location:

kernel/arch/sparc64/src

Files:

• console.c (modified) (1 diff)
• drivers/fhc.c (added)
• drivers/kbd.c (modified) (1 diff)
• drivers/tick.c (modified) (2 diffs)
• trap/interrupt.c (modified) (2 diffs)

kernel/arch/sparc64/src/console.c

@@ -85 +85 @@
         while (1) {
 #ifdef CONFIG_Z8530
-                z8530_poll();
+                return;
 #endif
 #ifdef CONFIG_NS16550

kernel/arch/sparc64/src/drivers/kbd.c

@@ -61 +61 @@
          * However, the physical keyboard address can
          * be pretty much unaligned on some systems
-         * (e.g. Ultra 5, Ultras 60).
+         * (e.g. Ultra 5, Ultra 60).
          */
         aligned_addr = ALIGN_DOWN(bootinfo.keyboard.addr, PAGE_SIZE);

kernel/arch/sparc64/src/drivers/tick.c

@@ -27 +27 @@
  */
 
- /** @addtogroup sparc64        
+/** @addtogroup sparc64 
  * @{
  */
@@ -89 +89 @@
 }
 
- /** @}
+/** @}
  */
-

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

@@ -34 +34 @@
 
 #include <arch/interrupt.h>
+#include <arch/trap/interrupt.h>
 #include <interrupt.h>
+#include <arch/drivers/fhc.h>
 #include <arch/types.h>
 #include <debug.h>
 #include <ipc/sysipc.h>
+#include <arch/asm.h>
+#include <arch/barrier.h>
+
+#include <genarch/kbd/z8530.h>
 
 /** Register Interrupt Level Handler.
@@ -59 +65 @@
 }
 
+void interrupt(void)
+{
+        uint64_t intrcv;
+        uint64_t data0;
+
+        intrcv = asi_u64_read(ASI_INTR_RECEIVE, 0);
+        data0 = asi_u64_read(ASI_UDB_INTR_R, ASI_UDB_INTR_R_DATA_0);
+
+        switch (data0) {
+#ifdef CONFIG_Z8530
+        case Z8530_INTRCV_DATA0:
+                /*
+                 * So far, we know we got this interrupt through the FHC.
+                 * Since we don't have enough information about the FHC and
+                 * because the interrupt looks like level sensitive,
+                 * we cannot handle it by scheduling one of the level
+                 * interrupt traps. Call the interrupt handler directly.
+                 */
+                fhc_uart_reset();
+                z8530_interrupt();
+                break;
+#endif
+        }
+
+        membar();
+        asi_u64_write(ASI_INTR_RECEIVE, 0, 0);
+}
+
 /** @}
  */
-