Changeset e2cc9a0 in mainline for kernel/genarch/src

Timestamp:

2006-10-06T22:37:15Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

33b1903

Parents:

233af8c5

Message:

Add support for interrupt mapping in the Sabre PCI controller.
Add support for PCI and EBUS interrupt mapping via the OpenFirmware device tree.
Unfortunatelly, the code is not capable enough to earn single ns16550 interrupt.
I suspect something needs to be enabled in the EBUS registers.

Location:

kernel/genarch/src

Files:

• kbd/ns16550.c (modified) (2 diffs)
• ofw/ebus.c (modified) (3 diffs)
• ofw/upa.c (modified) (1 diff)

kernel/genarch/src/kbd/ns16550.c

@@ -91 +91 @@
         sysinfo_set_item_val("kbd.irq", NULL, 0);
         sysinfo_set_item_val("kbd.address.virtual", NULL, (uintptr_t) kbd_virt_address);
+        
+        ns16550_ier_write(IER_ERBFI);                           /* enable receiver interrupt */
+        
+        while (ns16550_lsr_read() & LSR_DATA_READY)
+                (void) ns16550_rbr_read();
 }
 
@@ -145 +150 @@
         uint8_t x;
 
-        while (((x = ns16550_lsr_read() & LSR_DATA_READY))) {
+        while (ns16550_lsr_read() & LSR_DATA_READY) {
                 x = ns16550_rbr_read();
                 if (x != IGNORE_CODE) {

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>
 #include <func.h>
 #include <panic.h>
@@ -43 +45 @@
 #include <macros.h>
 
+/** Apply EBUS ranges to EBUS register. */
 bool ofw_ebus_apply_ranges(ofw_tree_node_t *node, ofw_ebus_reg_t *reg, uintptr_t *pa)
 {
@@ -113 +116 @@
          * 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.
          */
 
         controller = ofw_tree_find_node_by_handle(ofw_tree_lookup("/"), intr_map[i].controller_handle);
+        if (!controller)
+                return false;
+                
+        if (strcmp(ofw_tree_node_name(controller), "pci") != 0) {
+                /*
+                 * This is not a PCI node.
+                 */
+                return false;
+        }
+
+        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);
+
+        *inr = intr_map[i].controller_inr;
+        *inr |= 0x1f << IGN_SHIFT;              /* 0x1f is hardwired IGN */
         
-        *inr = intr_map[i].controller_inr;
         return true;
 }

kernel/genarch/src/ofw/upa.c

@@ -46 +46 @@
 {
         *pa = reg->addr;
-        return false;
+        return true;
 }