Changeset 8d2760f in mainline for kernel/arch/sparc64/src

Timestamp:

2008-11-29T20:24:47Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

57e76cb

Parents:

dfd77382

Message:

Add additional members to the irq_t structure so that an interrupt-driven driver
does not need to know how to clear the level interrupt. The z8530 was modified
in this way and is much more generic. The ns16550 driver has also been modified,
but awaits testing. The sparc64 interrupt mapping and dispatch code is now using
the new info and calls the clear-interrupt-routine itself.

Location:

kernel/arch/sparc64/src

Files:

• drivers/fhc.c (modified) (1 diff)
• drivers/kbd.c (modified) (4 diffs)
• drivers/pci.c (modified) (2 diffs)
• trap/interrupt.c (modified) (2 diffs)

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

@@ -102 +102 @@
 }
 
-void fhc_clear_interrupt(fhc_t *fhc, int inr)
+void fhc_clear_interrupt(void *fhcp, int inr)
 {
+        fhc_t *fhc = (fhc_t *)fhcp;
         ASSERT(fhc->uart_imap);
 

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

@@ -64 +64 @@
         ofw_tree_property_t *prop;
         const char *name;
+        cir_t cir;
+        void *cir_arg;
         
         name = ofw_tree_node_name(node);
@@ -110 +112 @@
                 }
                 if (!ofw_fhc_map_interrupt(node->parent,
-                    ((ofw_fhc_reg_t *) prop->value), interrupts, &inr)) {
+                    ((ofw_fhc_reg_t *) prop->value), interrupts, &inr, &cir,
+                    &cir_arg)) {
                         printf("Failed to determine keyboard interrupt.\n");
                         return;
@@ -124 +127 @@
                 }
                 if (!ofw_ebus_map_interrupt(node->parent,
-                    ((ofw_ebus_reg_t *) prop->value), interrupts, &inr)) {
+                    ((ofw_ebus_reg_t *) prop->value), interrupts, &inr, &cir,
+                    &cir_arg)) {
                         printf("Failed to determine keyboard interrupt.\n");
                         return;
@@ -147 +151 @@
 #ifdef CONFIG_Z8530
         case KBD_Z8530:
-                z8530_init(devno, inr, vaddr);
+                z8530_init(devno, vaddr, inr, cir, cir_arg);
                 break;
 #endif
 #ifdef CONFIG_NS16550
         case KBD_NS16550:
-                ns16550_init(devno, inr, (ioport_t)vaddr);
+                ns16550_init(devno, (ioport_t)vaddr, inr, cir, cir_arg);
                 break;
 #endif

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

@@ -55 +55 @@
 #define OBIO_CIR(ino)   (OBIO_CIR_BASE + ((ino) & INO_MASK))
 
-static void obio_enable_interrupt(pci_t *pci, int inr);
-static void obio_clear_interrupt(pci_t *pci, int inr);
-
-static pci_t *pci_sabre_init(ofw_tree_node_t *node);
-static pci_t *pci_psycho_init(ofw_tree_node_t *node);
+static void obio_enable_interrupt(pci_t *, int);
+static void obio_clear_interrupt(pci_t *, int);
+
+static pci_t *pci_sabre_init(ofw_tree_node_t *);
+static pci_t *pci_psycho_init(ofw_tree_node_t *);
 
 /** PCI operations for Sabre model. */
@@ -209 +209 @@
 }
 
-void pci_clear_interrupt(pci_t *pci, int inr)
-{
+void pci_clear_interrupt(void *pcip, int inr)
+{
+        pci_t *pci = (pci_t *)pcip;
+
         ASSERT(pci->op && pci->op->clear_interrupt);
         pci->op->clear_interrupt(pci, inr);

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

@@ -80 +80 @@
                  */
                 irq->handler(irq, irq->arg);
+                /*
+                 * 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) {
@@ -99 +105 @@
 #ifdef CONFIG_DEBUG
                 printf("cpu%u: spurious interrupt (intrcv=%#" PRIx64
-                        ", data0=%#" PRIx64 ")\n", CPU->id, intrcv, data0);
+                    ", data0=%#" PRIx64 ")\n", CPU->id, intrcv, data0);
 #endif
         }