Changeset 0b414b5 in mainline for kernel/genarch

Timestamp:

2006-10-02T21:07:23Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

233af8c5

Parents:

36db5ac

Message:

Extend the OFW device tree node with a void pointer. The boot loader is
supposed to reset all pointers in all nodes. The kernel uses the pointer
to recognize that a particular device has already been visited and initialized.

Read interrupt mapping from the OFW device tree for FHC devices (z8530) and
EBUS devices (ns16550). In case of FHC devices, remove hardwired values from
the code and use only values read from the tree. FHC initialization is started
when a FHC device wants to map its interrupt. In case of EBUS devices, map
the interrupt to INO. Interrupt enabling in the interrupt controller for that
specific interrupt is not implemented yet.

Location:

kernel/genarch

Files:

• include/ofw/ofw_tree.h (modified) (3 diffs)
• src/kbd/z8530.c (modified) (2 diffs)
• src/ofw/ebus.c (modified) (2 diffs)
• src/ofw/fhc.c (modified) (2 diffs)

kernel/genarch/include/ofw/ofw_tree.h

@@ -50 +50 @@
         unsigned properties;                    /**< Number of properties. */
         ofw_tree_property_t *property;
+        
+        /**
+         * Pointer to a structure representing respective device.
+         * Its semantics is device dependent.
+         */
+        void *device;
 };
 
@@ -105 +111 @@
 typedef struct ofw_ebus_range ofw_ebus_range_t;
 
+struct ofw_ebus_intr_map {
+        uint32_t space;
+        uint32_t addr;
+        uint32_t intr;
+        uint32_t controller_handle;
+        uint32_t controller_ino;
+} __attribute__ ((packed));
+typedef struct ofw_ebus_intr_map ofw_ebus_intr_map_t;
+
+struct ofw_ebus_intr_mask {
+        uint32_t space_mask;
+        uint32_t addr_mask;
+        uint32_t intr_mask;
+} __attribute__ ((packed));
+typedef struct ofw_ebus_intr_mask ofw_ebus_intr_mask_t;
+
 struct ofw_pci_reg {
-        uint32_t space;                 /* needs to masked to obtain pure space id */
+        uint32_t space;                 /* needs to be masked to obtain pure space id */
         uint64_t addr;                  /* group phys.mid and phys.lo together */
         uint64_t size;
@@ -144 +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 *ino);
+extern bool ofw_ebus_map_interrupts(ofw_tree_node_t *node, ofw_ebus_reg_t *reg, uint32_t interrupt, int *ino);
+
 #endif

kernel/genarch/src/kbd/z8530.c

@@ -39 +39 @@
 #include <genarch/kbd/scanc.h>
 #include <genarch/kbd/scanc_sun.h>
-#include <arch/drivers/fhc.h>
 #include <arch/drivers/z8530.h>
 #include <arch/interrupt.h>
@@ -107 +106 @@
         
         z8530_write_a(WR9, WR9_MIE);            /* Master Interrupt Enable. */
-        
-        /*
-         * We need to initialize the FireHose Controller,
-         * to which is this z8530 attached. Otherwise
-         * interrupts generated by the z8530 would not
-         * be forwarded to the CPU.
-         */
-        fhc_init();
 }
 

kernel/genarch/src/ofw/ebus.c

@@ -40 +40 @@
 #include <func.h>
 #include <panic.h>
+#include <debug.h>
 #include <macros.h>
 
@@ -74 +75 @@
 }
 
+bool ofw_ebus_map_interrupts(ofw_tree_node_t *node, ofw_ebus_reg_t *reg, uint32_t interrupt, int *ino)
+{
+        ofw_tree_property_t *prop;
+        ofw_tree_node_t *controller;
+        
+        prop = ofw_tree_getprop(node, "interrupt-map");
+        if (!prop || !prop->value)
+                return false;
+
+        ofw_ebus_intr_map_t *intr_map = prop->value;
+        count_t count = prop->size / sizeof(ofw_ebus_intr_map_t);
+        
+        ASSERT(count);
+        
+        prop = ofw_tree_getprop(node, "interrupt-map-mask");
+        if (!prop || !prop->value)
+                return false;
+        
+        ofw_ebus_intr_mask_t *intr_mask = prop->value;
+        
+        ASSERT(prop->size == sizeof(ofw_ebus_intr_mask_t));
+        
+        uint32_t space = reg->space & intr_mask->space_mask;
+        uint32_t addr = reg->addr & intr_mask->addr_mask;
+        uint32_t intr = interrupt & intr_mask->intr_mask;
+        
+        int i;
+        for (i = 0; i < count; i++) {
+                if ((intr_map[i].space == space) && (intr_map[i].addr == addr)
+                        && (intr_map[i].intr == intr))
+                        goto found;
+        }
+        return false;
+
+found:
+        /*
+         * We found the device that functions as an interrupt controller
+         * for the interrupt. We also found mapping from interrupt to INO.
+         */
+
+        controller = ofw_tree_find_node_by_handle(ofw_tree_lookup("/"), intr_map[i].controller_handle);
+        
+        *ino = intr_map[i].controller_ino;
+        return true;
+}
+
 /** @}
  */

kernel/genarch/src/ofw/fhc.c

@@ -37 +37 @@
 
 #include <genarch/ofw/ofw_tree.h>
+#include <arch/drivers/fhc.h>
 #include <arch/memstr.h>
 #include <func.h>
@@ -109 +110 @@
 }
 
+bool ofw_fhc_map_interrupts(ofw_tree_node_t *node, ofw_fhc_reg_t *reg, uint32_t interrupt, int *ino)
+{
+        fhc_t *fhc = NULL;
+        if (!node->device) {
+                fhc = fhc_init(node);
+                if (!fhc)
+                        return false;
+                node->device = fhc;
+                central_fhc = fhc;
+        }
+        
+        /*
+         * The interrupt controller for the interrupt is the FHC itself.
+         */
+        fhc_enable_interrupt(fhc, interrupt);
+        
+        *ino = interrupt;
+        return true;
+}
+
 /** @}
  */