Changeset 8d2760f in mainline for kernel/genarch/src/ofw

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/genarch/src/ofw

Files:

• ebus.c (modified) (6 diffs)
• fhc.c (modified) (2 diffs)
• pci.c (modified) (6 diffs)

kernel/genarch/src/ofw/ebus.c

@@ -45 +45 @@
 
 /** Apply EBUS ranges to EBUS register. */
-bool ofw_ebus_apply_ranges(ofw_tree_node_t *node, ofw_ebus_reg_t *reg, uintptr_t *pa)
+bool
+ofw_ebus_apply_ranges(ofw_tree_node_t *node, ofw_ebus_reg_t *reg, uintptr_t *pa)
 {
         ofw_tree_property_t *prop;
@@ -63 +64 @@
                 if (reg->space != range[i].child_space)
                         continue;
-                if (overlaps(reg->addr, reg->size, range[i].child_base, range[i].size)) {
+                if (overlaps(reg->addr, reg->size, range[i].child_base,
+                    range[i].size)) {
                         ofw_pci_reg_t pci_reg;
                         
                         pci_reg.space = range[i].parent_space;
-                        pci_reg.addr = range[i].parent_base + (reg->addr - range[i].child_base);
+                        pci_reg.addr = range[i].parent_base +
+                            (reg->addr - range[i].child_base);
                         pci_reg.size = reg->size;
                         
@@ -77 +80 @@
 }
 
-bool ofw_ebus_map_interrupt(ofw_tree_node_t *node, ofw_ebus_reg_t *reg, uint32_t interrupt, int *inr)
+bool
+ofw_ebus_map_interrupt(ofw_tree_node_t *node, ofw_ebus_reg_t *reg,
+    uint32_t interrupt, int *inr, cir_t *cir, void **cir_arg)
 {
         ofw_tree_property_t *prop;
@@ -105 +110 @@
         unsigned int i;
         for (i = 0; i < count; i++) {
-                if ((intr_map[i].space == space) && (intr_map[i].addr == addr)
-                        && (intr_map[i].intr == intr))
+                if ((intr_map[i].space == space) &&
+                    (intr_map[i].addr == addr) && (intr_map[i].intr == intr))
                         goto found;
         }
@@ -114 +119 @@
         /*
          * We found the device that functions as an interrupt controller
-         * for the interrupt. We also found partial mapping from interrupt to INO.
+         * for the interrupt. We also found partial mapping from interrupt to
+         * INO.
          */
 
-        controller = ofw_tree_find_node_by_handle(ofw_tree_lookup("/"), intr_map[i].controller_handle);
+        controller = ofw_tree_find_node_by_handle(ofw_tree_lookup("/"),
+            intr_map[i].controller_handle);
         if (!controller)
                 return false;
@@ -131 +138 @@
          * Let the PCI do the next step in mapping the interrupt.
          */
-        if (!ofw_pci_map_interrupt(controller, NULL, intr_map[i].controller_ino, inr))
+        if (!ofw_pci_map_interrupt(controller, NULL, intr_map[i].controller_ino,
+            inr, cir, cir_arg))
                 return false;
 

kernel/genarch/src/ofw/fhc.c

@@ -110 +110 @@
 }
 
-bool ofw_fhc_map_interrupt(ofw_tree_node_t *node, ofw_fhc_reg_t *reg, uint32_t interrupt, int *inr)
+bool
+ofw_fhc_map_interrupt(ofw_tree_node_t *node, ofw_fhc_reg_t *reg,
+    uint32_t interrupt, int *inr, cir_t *cir, void **cir_arg)
 {
         fhc_t *fhc = NULL;
@@ -127 +129 @@
         
         *inr = interrupt;
+        *cir = fhc_clear_interrupt;
+        *cir_arg = fhc;
         return true;
 }

kernel/genarch/src/ofw/pci.c

@@ -50 +50 @@
 #define PCI_IGN                 0x1f
 
-bool ofw_pci_apply_ranges(ofw_tree_node_t *node, ofw_pci_reg_t *reg, uintptr_t *pa)
+bool
+ofw_pci_apply_ranges(ofw_tree_node_t *node, ofw_pci_reg_t *reg, uintptr_t *pa)
 {
         ofw_tree_property_t *prop;
@@ -69 +70 @@
         
         for (i = 0; i < ranges; i++) {
-                if ((reg->space & PCI_SPACE_MASK) != (range[i].space & PCI_SPACE_MASK))
+                if ((reg->space & PCI_SPACE_MASK) !=
+                    (range[i].space & PCI_SPACE_MASK))
                         continue;
-                if (overlaps(reg->addr, reg->size, range[i].child_base, range[i].size)) {
-                        *pa = range[i].parent_base + (reg->addr - range[i].child_base);
+                if (overlaps(reg->addr, reg->size, range[i].child_base,
+                    range[i].size)) {
+                        *pa = range[i].parent_base +
+                            (reg->addr - range[i].child_base);
                         return true;
                 }
@@ -80 +84 @@
 }
 
-bool ofw_pci_reg_absolutize(ofw_tree_node_t *node, ofw_pci_reg_t *reg, ofw_pci_reg_t *out)
+bool
+ofw_pci_reg_absolutize(ofw_tree_node_t *node, ofw_pci_reg_t *reg,
+    ofw_pci_reg_t *out)
 {
         if (reg->space & PCI_ABS_MASK) {
@@ -104 +110 @@
         
         for (i = 0; i < assigned_addresses; i++) {
-                if ((assigned_address[i].space & PCI_REG_MASK) == (reg->space & PCI_REG_MASK)) {
+                if ((assigned_address[i].space & PCI_REG_MASK) ==
+                    (reg->space & PCI_REG_MASK)) {
                         out->space = assigned_address[i].space;
                         out->addr = reg->addr + assigned_address[i].addr;
@@ -120 +127 @@
  * to a PCI bridge.
  */
-bool ofw_pci_map_interrupt(ofw_tree_node_t *node, ofw_pci_reg_t *reg, int ino, int *inr)
+bool
+ofw_pci_map_interrupt(ofw_tree_node_t *node, ofw_pci_reg_t *reg, int ino,
+    int *inr, cir_t *cir, void **cir_arg)
 {
         pci_t *pci = node->device;
@@ -133 +142 @@
 
         *inr = (PCI_IGN << IGN_SHIFT) | ino;
+        *cir = pci_clear_interrupt;
+        *cir_arg = pci;
 
         return true;