Changeset 4d2dba7 in mainline

Timestamp:

2013-10-15T17:05:26Z (11 years ago)

Author:

Jakub Klama <jakub.klama@…>

Branches:

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

Children:

f988a13

Parents:

a73ebf0

Message:

Implementation of IRQMP interrupt controller and UART drivers, part 2.
Modified kernel config files to reflect presence of new drivers.

Files:

• HelenOS.config (modified) (3 diffs)
• defaults/sparc32/leon3/Makefile.config (modified) (1 diff)
• kernel/genarch/include/genarch/drivers/grlib_irqmp/grlib_irqmp.h (modified) (2 diffs)
• kernel/genarch/include/genarch/drivers/grlib_uart/grlib_uart.h (modified) (2 diffs)
• kernel/genarch/src/drivers/grlib_irqmp/grlib_irqmp.c (modified) (1 diff)
• kernel/genarch/src/drivers/grlib_uart/grlib_uart.c (modified) (4 diffs)

HelenOS.config

@@ -64 +64 @@
 % Machine type
 @ "leon3" Gaisler Aeroflex LEON3
-! [PLATFORM=sarc32] MACHINE (choice)
+! [PLATFORM=sparc32] MACHINE (choice)
 
 % Machine type
@@ -504 +504 @@
 % Support for OMAP on-chip UART
 ! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&(MACHINE=beagleboardxm|MACHINE=beaglebone)] CONFIG_OMAP_UART (y/n)
+
+% Support for GRLIB UART
+! [PLATFORM=sparc32&MACHINE=leon3] CONFIG_GRLIB_UART (y)
+
+% Support for GRLIB IRQMP
+! [PLATFORM=sparc32&MACHINE=leon3] CONFIG_GRLIB_IRQMP (y)
 
 % Support for i8042 controller
@@ -639 +645 @@
 @ "5" Linux kernel
 ! [PLATFORM=arm32&MACHINE!=beagleboardxm&MACHINE!=beaglebone] UIMAGE_OS (choice)
+
+% uImage OS type
+@ "5" Linux kernel
+! [PLATFORM=sparc32] UIMAGE_OS (choice)

defaults/sparc32/leon3/Makefile.config

@@ -10 +10 @@
 # GRLIB APBUART
 CONFIG_GRLIB_UART = y
+
+# GRLIB IRQMP
+CONFIG_GRLIB_IRQMP = y

kernel/genarch/include/genarch/drivers/grlib_irqmp/grlib_irqmp.h

@@ -39 +39 @@
 
 #include <typedefs.h>
+#include <arch.h>
 
 #define GRLIB_IRQMP_MASK_OFFSET         0x40
@@ -70 +71 @@
 } grlib_irqmp_t;
 
-extern void grlib_irqmp_init(grlib_irqmp_t *, grlib_irqmp_regs_t *);
-extern unsigned grlib_irqmp_inum_get(grlib_irqmp_t *);
-extern void grlib_irqmp_clear(grlib_irqc_t *, int);
-extern void grlib_irqmp_irq_mask(grlib_irqc_t *, int);
-extern void grlib_irqmp_irq_unmask(grlib_irqc_t *, int);
+extern void grlib_irqmp_init(grlib_irqmp_t *, bootinfo_t *);
+extern int grlib_irqmp_inum_get(grlib_irqmp_t *);
+extern void grlib_irqmp_clear(grlib_irqmp_t *, int);
+extern void grlib_irqmp_mask(grlib_irqmp_t *, int);
+extern void grlib_irqmp_unmask(grlib_irqmp_t *, int);
 
 #endif

kernel/genarch/include/genarch/drivers/grlib_uart/grlib_uart.h

@@ -44 +44 @@
 #include <typedefs.h>
 
-/** GRLIB UART registers */
-typedef struct {
-        uint32_t data;
-        grlib_uart_status_t status;
-        grlib_uart_control_t control;
-        uint32_t scaler;
-        uint32_t debug;
-} grlib_uart_io_t;
-
 typedef struct {
         unsigned int rcnt: 6;
@@ -88 +79 @@
         unsigned int te: 1;
         unsigned int re: 1;
-};
+} grlib_uart_control_t;
+
+/** GRLIB UART registers */
+typedef struct {
+        uint32_t data;
+        uint32_t status;
+        uint32_t control;
+        uint32_t scaler;
+        uint32_t debug;
+} grlib_uart_io_t;
 
 typedef struct {

kernel/genarch/src/drivers/grlib_irqmp/grlib_irqmp.c

@@ -38 +38 @@
 #include <arch/asm.h>
 
-void grlib_irqmp_init(grlib_irqmp_t *irqc, grlib_irqmp_regs_t *regs)
+#include <mm/km.h>
+
+void grlib_irqmp_init(grlib_irqmp_t *irqc, bootinfo_t *bootinfo)
 {
-        irqc->regs = regs;
+        irqc->regs = (void *) km_map(bootinfo->intc_base, PAGE_SIZE,
+            PAGE_NOT_CACHEABLE);
+
+        /* Mask all interrupts */
+        pio_write_32((void *)&irqc->regs + GRLIB_IRQMP_MASK_OFFSET, 0);
 }
 
-unsigned grlib_irqmp_inum_get(grlib_irqmp_t *irqc)
+int grlib_irqmp_inum_get(grlib_irqmp_t *irqc)
 {
-        return 0;
+        int i;
+        uint32_t pending = pio_read_32(&irqc->regs->pending);
+
+        for (i = 1; i < 16; i++) {
+                if (pending & (1 << i))
+                        return i;
+        }
+
+        return -1;
 }
 
-void grlib_irqmp_clear(grlib_irqmp_t *irqc, unsigned inum)
+void grlib_irqmp_clear(grlib_irqmp_t *irqc, int inum)
 {
+        pio_write_32(&irqc->regs->clear, (1 << inum));
 }
 
-void grlib_irqmp_src_enable(grlib_irqmp_t *irqc, unsigned src)
+void grlib_irqmp_mask(grlib_irqmp_t *irqc, int src)
 {
+        uint32_t mask = pio_read_32((void *)&irqc->regs + GRLIB_IRQMP_MASK_OFFSET);
+
+        mask &= ~(1 << src);
+
+        pio_write_32((void *)&irqc->regs + GRLIB_IRQMP_MASK_OFFSET, mask);
 }
 
-void grlib_irqmp_src_disable(grlib_irqmp_t *irqc, unsigned src)
+void grlib_irqmp_unmask(grlib_irqmp_t *irqc, int src)
 {
+        uint32_t mask = pio_read_32((void *)&irqc->regs + GRLIB_IRQMP_MASK_OFFSET);
+
+        mask |= (1 << src);
+
+        pio_write_32((void *)&irqc->regs + GRLIB_IRQMP_MASK_OFFSET, mask);
 }
 

kernel/genarch/src/drivers/grlib_uart/grlib_uart.c

@@ -50 +50 @@
 static void grlib_uart_sendb(outdev_t *dev, uint8_t byte)
 {
+        uint32_t reg;
         grlib_uart_status_t *status;
         grlib_uart_t *uart =
@@ -56 +57 @@
         /* Wait for space becoming available in Tx FIFO. */
         do {
-                status = pio_read_32(&uart->io->status);
+                reg = pio_read_32(&uart->io->status);
+                status = (grlib_uart_status_t *)®
         } while (status->tf != 0);
 
@@ -85 +87 @@
 static void grlib_uart_irq_handler(irq_t *irq)
 {
+        uint32_t reg;
         grlib_uart_t *uart = irq->instance;
-        grlib_status_t status;
+        grlib_uart_status_t *status;
 
-        status = (grlib_status_t)pio_read_32(&uart->io->status);
+        reg = pio_read_32(&uart->io->status);
+        status = (grlib_uart_status_t *)®
 
         while (status->dr != 0) {
                 uint32_t data = pio_read_32(&uart->io->data);
-                status = (grlib_status_t)pio_read_32(&uart->io->status);
+                reg = pio_read_32(&uart->io->status);
+                status = (grlib_uart_status_t *)®
                 indev_push_character(uart->indev, data & 0xff);
         }
@@ -131 +136 @@
 
         /* Enable FIFO, Tx trigger level: empty, Rx trigger level: 1 byte. */
-        grlib_control_t control = 
+        grlib_uart_control_t control = 
                 { .fa = 1, .rf = 1, .tf = 1, .ri = 1, 
                   .te = 1, .re = 1};
 
-        pio_write_32(&uart->io->control, control);
+        uint32_t *reg = (uint32_t *)&control;
+        pio_write_32(&uart->io->control, *reg);
 
         link_initialize(&uart->parea.link);