Changeset e2cc9a0 in mainline

Timestamp:

2006-10-06T22:37:15Z (18 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

Files:

• arch/sparc64/Makefile.inc (modified) (1 diff)
• arch/sparc64/include/asm.h (modified) (2 diffs)
• arch/sparc64/include/drivers/ns16550.h (modified) (2 diffs)
• arch/sparc64/include/drivers/pci.h (added)
• arch/sparc64/include/trap/interrupt.h (modified) (1 diff)
• arch/sparc64/src/drivers/kbd.c (modified) (3 diffs)
• arch/sparc64/src/drivers/pci.c (added)
• genarch/src/kbd/ns16550.c (modified) (2 diffs)
• genarch/src/ofw/ebus.c (modified) (3 diffs)
• genarch/src/ofw/upa.c (modified) (1 diff)

kernel/arch/sparc64/Makefile.inc

@@ -101 +101 @@
         arch/$(ARCH)/src/drivers/tick.c \
         arch/$(ARCH)/src/drivers/kbd.c \
-        arch/$(ARCH)/src/drivers/scr.c
+        arch/$(ARCH)/src/drivers/scr.c \
+        arch/$(ARCH)/src/drivers/pci.c
 
 ifeq ($(CONFIG_SMP),y)

kernel/arch/sparc64/include/asm.h

@@ -325 +325 @@
         uint64_t v;
         
-        __asm__ volatile ("ldxa [%1] %2, %0\n" : "=r" (v) : "r" (va), "i" (asi));
+        __asm__ volatile ("ldxa [%1] %2, %0\n" : "=r" (v) : "r" (va), "i" ((unsigned) asi));
         
         return v;
@@ -338 +338 @@
 static inline void asi_u64_write(asi_t asi, uintptr_t va, uint64_t v)
 {
-        __asm__ volatile ("stxa %0, [%1] %2\n" : :  "r" (v), "r" (va), "i" (asi) : "memory");
+        __asm__ volatile ("stxa %0, [%1] %2\n" : :  "r" (v), "r" (va), "i" ((unsigned) asi) : "memory");
 }
 

kernel/arch/sparc64/include/drivers/ns16550.h

@@ -39 +39 @@
 #include <arch/drivers/kbd.h>
 
+/* NS16550 registers */
 #define RBR_REG         0       /** Receiver Buffer Register. */
 #define IER_REG         1       /** Interrupt Enable Register. */
+#define IIR_REG         2       /** Interrupt Ident Register (read). */
+#define FCR_REG         2       /** FIFO control register (write). */
+#define LCR_REG         3       /** Line Control register. */
 #define LSR_REG         5       /** Line Status Register. */
+
+#define IER_ERBFI       0x01    /** Enable Receive Buffer Full Interrupt. */
+
+#define LCR_DLAB        0x80    /** Divisor Latch Access bit. */
 
 static inline uint8_t ns16550_rbr_read(void)
@@ -58 +66 @@
 }
 
+static inline uint8_t ns16550_iir_read(void)
+{
+        return kbd_virt_address[IIR_REG];
+}
+
+static inline void ns16550_fcr_write(uint8_t v)
+{
+        kbd_virt_address[FCR_REG] = v;
+}
+
+static inline uint8_t ns16550_lcr_read(void)
+{
+        return kbd_virt_address[LCR_REG];
+}
+
+static inline void ns16550_lcr_write(uint8_t v)
+{
+        kbd_virt_address[LCR_REG] = v;
+}
+
 static inline uint8_t ns16550_lsr_read(void)
 {

kernel/arch/sparc64/include/trap/interrupt.h

@@ -40 +40 @@
 #include <arch/trap/trap_table.h>
 #include <arch/stack.h>
+
+/* IMAP register bits */
+#define IGN_MASK        0x7c0
+#define INO_MASK        0x1f
+#define IMAP_V_MASK     (1ULL<<31)
+
+#define IGN_SHIFT       6
+
 
 /* Interrupt ASI registers. */

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

@@ -100 +100 @@
         uintptr_t pa;
         size_t size;
-        int ino;
+        int inr;
         
         switch (kbd_type) {
@@ -109 +109 @@
                         return;
                 }
-                if (!ofw_fhc_map_interrupts(node->parent, ((ofw_fhc_reg_t *) prop->value), interrupts, &ino)) {
+                if (!ofw_fhc_map_interrupts(node->parent, ((ofw_fhc_reg_t *) prop->value), interrupts, &inr)) {
                         printf("Failed to determine keyboard interrupts.\n");
                         return;
@@ -120 +120 @@
                         return;
                 }
-                if (!ofw_ebus_map_interrupts(node->parent, ((ofw_ebus_reg_t *) prop->value), interrupts, &ino)) {
+                if (!ofw_ebus_map_interrupts(node->parent, ((ofw_ebus_reg_t *) prop->value), interrupts, &inr)) {
                         printf("Failed to determine keyboard interrupts.\n");
                         return;

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;
 }