Changeset 571addd in mainline for kernel/genarch

Timestamp:

2010-07-27T21:42:47Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

69a60c4

Parents:

5a9f4d7 (diff), 1720cf9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jsvoboda/helenos/gta02.

Location:

kernel/genarch

Files:

• Makefile.inc (modified) (1 diff)
• include/drivers/s3c24xx_irqc/s3c24xx_irqc.h (modified) (2 diffs)
• include/drivers/s3c24xx_uart/s3c24xx_uart.h (modified) (1 diff)
• src/drivers/s3c24xx_irqc/s3c24xx_irqc.c (added)
• src/drivers/s3c24xx_uart/s3c24xx_uart.c (modified) (7 diffs)

kernel/genarch/Makefile.inc

@@ -90 +90 @@
 endif
 
+ifeq ($(CONFIG_S3C24XX_IRQC),y)
+        GENARCH_SOURCES += \
+                genarch/src/drivers/s3c24xx_irqc/s3c24xx_irqc.c
+endif
+
 ifeq ($(CONFIG_S3C24XX_UART),y)
         GENARCH_SOURCES += \

kernel/genarch/include/drivers/s3c24xx_irqc/s3c24xx_irqc.h

@@ -53 +53 @@
         ioport32_t subsrcpnd;   /**< Sub source pending */
         ioport32_t intsubmsk;   /** Interrupt sub mask */
-} s3c24xx_irqc_t;
+} s3c24xx_irqc_regs_t;
 
 /** S3C24xx Interrupt source numbers.
@@ -120 +120 @@
 #define S3C24XX_SUBINT_BIT(subsource) (1 << (subsource))
 
+typedef struct {
+        s3c24xx_irqc_regs_t *regs;
+} s3c24xx_irqc_t;
+
+extern void s3c24xx_irqc_init(s3c24xx_irqc_t *, s3c24xx_irqc_regs_t *);
+extern unsigned s3c24xx_irqc_inum_get(s3c24xx_irqc_t *);
+extern void s3c24xx_irqc_clear(s3c24xx_irqc_t *, unsigned);
+extern void s3c24xx_irqc_src_enable(s3c24xx_irqc_t *, unsigned);
+extern void s3c24xx_irqc_src_disable(s3c24xx_irqc_t *, unsigned);
+extern void s3c24xx_irqc_subsrc_enable(s3c24xx_irqc_t *, unsigned);
+extern void s3c24xx_irqc_subsrc_disable(s3c24xx_irqc_t *, unsigned);
+
 #endif
 

kernel/genarch/include/drivers/s3c24xx_uart/s3c24xx_uart.h

@@ -38 +38 @@
 #define KERN_S3C24XX_UART_H_
 
+#include <ddi/irq.h>
+#include <console/chardev.h>
 #include <typedefs.h>
-#include <console/chardev.h>
 
-extern outdev_t *s3c24xx_uart_init(ioport8_t *);
+/** S3C24xx UART I/O */
+typedef struct {
+        uint32_t ulcon;
+        uint32_t ucon;
+        uint32_t ufcon;
+        uint32_t umcon;
+
+        uint32_t utrstat;
+        uint32_t uerstat;
+        uint32_t ufstat;
+        uint32_t umstat;
+
+        uint32_t utxh;
+        uint32_t urxh;
+
+        uint32_t ubrdiv;
+} s3c24xx_uart_io_t;
+
+/** S3C24xx UART instance */
+typedef struct {
+        s3c24xx_uart_io_t *io;
+        indev_t *indev;
+        irq_t irq;
+} s3c24xx_uart_t;
+
+extern outdev_t *s3c24xx_uart_init(s3c24xx_uart_io_t *, inr_t inr);
+extern void s3c24xx_uart_input_wire(s3c24xx_uart_t *,
+    indev_t *);
 
 #endif

kernel/genarch/src/drivers/s3c24xx_uart/s3c24xx_uart.c

@@ -40 +40 @@
 #include <genarch/drivers/s3c24xx_uart/s3c24xx_uart.h>
 #include <console/chardev.h>
+#include <console/console.h>
+#include <ddi/device.h>
 #include <arch/asm.h>
 #include <mm/slab.h>
-#include <console/console.h>
 #include <sysinfo/sysinfo.h>
 #include <str.h>
 
-/** S3C24xx UART register offsets */
-#define S3C24XX_UTRSTAT         0x10
-#define S3C24XX_UTXH            0x20
+/* Bits in UTRSTAT register */
+#define S3C24XX_UTRSTAT_TX_EMPTY        0x4
+#define S3C24XX_UTRSTAT_RDATA           0x1
 
-/* Bits in UTXH register */
-#define S3C24XX_UTXH_TX_EMPTY   0x4
-
-typedef struct {
-        ioport8_t *base;
-} s3c24xx_uart_instance_t;
+#define S3C24XX_UFSTAT_TX_FULL          0x4000
+#define S3C24XX_UFSTAT_RX_FULL          0x0040
+#define S3C24XX_UFSTAT_RX_COUNT         0x002f
 
 static void s3c24xx_uart_sendb(outdev_t *dev, uint8_t byte)
 {
-        s3c24xx_uart_instance_t *instance =
-            (s3c24xx_uart_instance_t *) dev->data;
-        ioport32_t *utrstat, *utxh;
+        s3c24xx_uart_t *uart =
+            (s3c24xx_uart_t *) dev->data;
 
-        utrstat = (ioport32_t *) (instance->base + S3C24XX_UTRSTAT);
-        utxh = (ioport32_t *) (instance->base + S3C24XX_UTXH);
-
-        /* Wait for transmitter to be empty. */
-        while ((pio_read_32(utrstat) & S3C24XX_UTXH_TX_EMPTY) == 0)
+        /* Wait for space becoming available in Tx FIFO. */
+        while ((pio_read_32(&uart->io->ufstat) & S3C24XX_UFSTAT_TX_FULL) != 0)
                 ;
 
-        pio_write_32(utxh, byte);
+        pio_write_32(&uart->io->utxh, byte);
 }
 
@@ -86 +80 @@
 }
 
+static irq_ownership_t s3c24xx_uart_claim(irq_t *irq)
+{
+        return IRQ_ACCEPT;
+}
+
+static void s3c24xx_uart_irq_handler(irq_t *irq)
+{
+        s3c24xx_uart_t *uart = irq->instance;
+
+        while ((pio_read_32(&uart->io->ufstat) & S3C24XX_UFSTAT_RX_COUNT) != 0) {
+                uint32_t data = pio_read_32(&uart->io->urxh);
+                pio_read_32(&uart->io->uerstat);
+                indev_push_character(uart->indev, data & 0xff);
+        }
+}
+
 static outdev_operations_t s3c24xx_uart_ops = {
         .write = s3c24xx_uart_putchar,
@@ -91 +101 @@
 };
 
-outdev_t *s3c24xx_uart_init(ioport8_t *base)
+outdev_t *s3c24xx_uart_init(s3c24xx_uart_io_t *io, inr_t inr)
 {
         outdev_t *uart_dev = malloc(sizeof(outdev_t), FRAME_ATOMIC);
@@ -97 +107 @@
                 return NULL;
 
-        s3c24xx_uart_instance_t *instance =
-            malloc(sizeof(s3c24xx_uart_instance_t), FRAME_ATOMIC);
-        if (!instance) {
+        s3c24xx_uart_t *uart =
+            malloc(sizeof(s3c24xx_uart_t), FRAME_ATOMIC);
+        if (!uart) {
                 free(uart_dev);
                 return NULL;
@@ -105 +115 @@
 
         outdev_initialize("s3c24xx_uart_dev", uart_dev, &s3c24xx_uart_ops);
-        uart_dev->data = instance;
+        uart_dev->data = uart;
 
-        instance->base = base;
+        uart->io = io;
+        uart->indev = NULL;
+
+        /* Initialize IRQ structure. */
+        irq_initialize(&uart->irq);
+        uart->irq.devno = device_assign_devno();
+        uart->irq.inr = inr;
+        uart->irq.claim = s3c24xx_uart_claim;
+        uart->irq.handler = s3c24xx_uart_irq_handler;
+        uart->irq.instance = uart;
+
+        /* Enable FIFO, Tx trigger level: empty, Rx trigger level: 1 byte. */
+        pio_write_32(&uart->io->ufcon, 0x01);
+
+        /* Set RX interrupt to pulse mode */
+        pio_write_32(&uart->io->ucon,
+            pio_read_32(&uart->io->ucon) & ~(1 << 8));
 
         if (!fb_exported) {
@@ -116 +142 @@
                 sysinfo_set_item_val("fb", NULL, true);
                 sysinfo_set_item_val("fb.kind", NULL, 3);
-                sysinfo_set_item_val("fb.address.physical", NULL, KA2PA(base));
+                sysinfo_set_item_val("fb.address.physical", NULL, KA2PA(io));
 
                 fb_exported = true;
@@ -124 +150 @@
 }
 
+void s3c24xx_uart_input_wire(s3c24xx_uart_t *uart, indev_t *indev)
+{
+        ASSERT(uart);
+        ASSERT(indev);
+
+        uart->indev = indev;
+        irq_register(&uart->irq);
+}
+
 /** @}
  */