Changeset 33b1903 in mainline

Timestamp:

2006-10-07T11:24:19Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8d4a577

Parents:

e2cc9a0

Message:

Separate mapping of EBUS interrupts into two parts: EBUS and PCI.

Location:

kernel

Files:

• arch/sparc64/src/drivers/kbd.c (modified) (2 diffs)
• genarch/include/ofw/ofw_tree.h (modified) (2 diffs)
• genarch/src/ofw/ebus.c (modified) (4 diffs)
• genarch/src/ofw/fhc.c (modified) (1 diff)
• genarch/src/ofw/pci.c (modified) (3 diffs)

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

@@ -109 +109 @@
                         return;
                 }
-                if (!ofw_fhc_map_interrupts(node->parent, ((ofw_fhc_reg_t *) prop->value), interrupts, &inr)) {
-                        printf("Failed to determine keyboard interrupts.\n");
+                if (!ofw_fhc_map_interrupt(node->parent, ((ofw_fhc_reg_t *) prop->value), interrupts, &inr)) {
+                        printf("Failed to determine keyboard interrupt.\n");
                         return;
                 }
@@ -120 +120 @@
                         return;
                 }
-                if (!ofw_ebus_map_interrupts(node->parent, ((ofw_ebus_reg_t *) prop->value), interrupts, &inr)) {
-                        printf("Failed to determine keyboard interrupts.\n");
+                if (!ofw_ebus_map_interrupt(node->parent, ((ofw_ebus_reg_t *) prop->value), interrupts, &inr)) {
+                        printf("Failed to determine keyboard interrupt.\n");
                         return;
                 }

kernel/genarch/include/ofw/ofw_tree.h

@@ -116 +116 @@
         uint32_t intr;
         uint32_t controller_handle;
-        uint32_t controller_inr;
+        uint32_t controller_ino;
 } __attribute__ ((packed));
 typedef struct ofw_ebus_intr_map ofw_ebus_intr_map_t;
@@ -166 +166 @@
 extern bool ofw_pci_reg_absolutize(ofw_tree_node_t *node, ofw_pci_reg_t *reg, ofw_pci_reg_t *out);
 
-extern bool ofw_fhc_map_interrupts(ofw_tree_node_t *node, ofw_fhc_reg_t *reg, uint32_t interrupt, int *inr);
-extern bool ofw_ebus_map_interrupts(ofw_tree_node_t *node, ofw_ebus_reg_t *reg, uint32_t interrupt, int *inr);
+extern bool ofw_fhc_map_interrupt(ofw_tree_node_t *node, ofw_fhc_reg_t *reg, uint32_t interrupt, int *inr);
+extern bool ofw_ebus_map_interrupt(ofw_tree_node_t *node, ofw_ebus_reg_t *reg, uint32_t interrupt, int *inr);
+extern bool ofw_pci_map_interrupt(ofw_tree_node_t *node, ofw_pci_reg_t *reg, int ino, int *inr);
 
 #endif

kernel/genarch/src/ofw/ebus.c

@@ -37 +37 @@
 
 #include <genarch/ofw/ofw_tree.h>
-#include <arch/drivers/pci.h>
 #include <arch/memstr.h>
 #include <arch/trap/interrupt.h>
@@ -78 +77 @@
 }
 
-bool ofw_ebus_map_interrupts(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)
 {
         ofw_tree_property_t *prop;
@@ -115 +114 @@
         /*
          * We found the device that functions as an interrupt controller
-         * for the interrupt. We also found mapping from interrupt to INR.
-         * What needs to be done now is to verify that this indeed is a PCI
-         * node.
+         * for the interrupt. We also found partial mapping from interrupt to INO.
          */
 
@@ -131 +128 @@
         }
 
-        pci_t *pci = controller->device;
-        if (!pci) {
-                pci = pci_init(controller);
-                if (!pci)
-                        return false;
-                controller->device = pci;
-                
-        }
-        pci_enable_interrupt(pci, intr_map[i].controller_inr);
+        /*
+         * Let the PCI do the next step in mapping the interrupt.
+         */
+        if (!ofw_pci_map_interrupt(controller, NULL, intr_map[i].controller_ino, inr))
+                return false;
 
-        *inr = intr_map[i].controller_inr;
-        *inr |= 0x1f << IGN_SHIFT;              /* 0x1f is hardwired IGN */
-        
         return true;
 }

kernel/genarch/src/ofw/fhc.c

@@ -110 +110 @@
 }
 
-bool ofw_fhc_map_interrupts(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)
 {
         fhc_t *fhc = NULL;

kernel/genarch/src/ofw/pci.c

@@ -37 +37 @@
 
 #include <genarch/ofw/ofw_tree.h>
+#include <arch/drivers/pci.h>
+#include <arch/trap/interrupt.h>
 #include <arch/memstr.h>
 #include <func.h>
@@ -45 +47 @@
 #define PCI_ABS_MASK            0x80000000      
 #define PCI_REG_MASK            0x000000ff
+
+#define PCI_IGN                 0x1f
 
 bool ofw_pci_apply_ranges(ofw_tree_node_t *node, ofw_pci_reg_t *reg, uintptr_t *pa)
@@ -111 +115 @@
 }
 
+/** Map PCI interrupt.
+ *
+ * So far, we only know how to map interrupts of non-PCI devices connected
+ * to a PCI bridge.
+ */
+bool ofw_pci_map_interrupt(ofw_tree_node_t *node, ofw_pci_reg_t *reg, int ino, int *inr)
+{
+        pci_t *pci = node->device;
+        if (!pci) {
+                pci = pci_init(node);
+                if (!pci)
+                        return false;
+                node->device = pci;
+        }
+
+        pci_enable_interrupt(pci, ino);
+
+        *inr = (PCI_IGN << IGN_SHIFT) | ino;
+
+        return true;
+}
+
 /** @}
  */