Changeset eef14771 in mainline

Timestamp:

2013-05-05T21:34:14Z (11 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

06fe3b6, 44ecf89

Parents:

716357f (diff), 69483af (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 the unified am335x/amdm37x uart kernel driver implementation

Files:

• HelenOS.config (modified) (2 diffs)
• kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c (modified) (2 diffs)
• kernel/arch/arm32/src/mach/beaglebone/beaglebone.c (modified) (3 diffs)
• kernel/genarch/Makefile.inc (modified) (2 diffs)
• kernel/genarch/include/genarch/drivers/am335x/uart.h (modified) (2 diffs)
• kernel/genarch/include/genarch/drivers/am335x/uart_regs.h (deleted)
• kernel/genarch/include/genarch/drivers/amdm37x/uart.h (modified) (2 diffs)
• kernel/genarch/include/genarch/drivers/amdm37x/uart_regs.h (deleted)
• kernel/genarch/include/genarch/drivers/omap/uart.h (added)
• kernel/genarch/include/genarch/drivers/omap/uart_regs.h (added)
• kernel/genarch/src/drivers/amdm37x/uart.c (deleted)
• kernel/genarch/src/drivers/omap/uart.c (moved) (moved from kernel/genarch/src/drivers/am335x/uart.c ) (10 diffs)

HelenOS.config

@@ -487 +487 @@
 ! [PLATFORM=arm32&MACHINE=gta02] CONFIG_S3C24XX_IRQC (y)
 
-% Support for TI AM335x on-chip UART
-! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&MACHINE=beaglebone] CONFIG_AM335X_UART (y/n)
-
 % Support for TI AM335x timers support
 ! [PLATFORM=arm32&MACHINE=beaglebone] CONFIG_AM335X_TIMERS (y)
 
-% Support for TI AMDM37x on-chip UART
-! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&MACHINE=beagleboardxm] CONFIG_AMDM37X_UART (y/n)
+% 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 i8042 controller
@@ -515 +512 @@
 
 % Serial line input module
-! [CONFIG_DSRLNIN=y|(PLATFORM=arm32&MACHINE=gta02)|(PLATFORM=arm32&MACHINE=integratorcp&CONFIG_ARM926_UART=y)|(PLATFORM=arm32&MACHINE=beaglebone&CONFIG_AM335X_UART=y)|(PLATFORM=arm32&MACHINE=beagleboardxm&CONFIG_AMDM37X_UART=y)|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&PROCESSOR=sun4v)] CONFIG_SRLN (y)
+! [CONFIG_DSRLNIN=y|(PLATFORM=arm32&MACHINE=gta02)|(PLATFORM=arm32&MACHINE=integratorcp&CONFIG_ARM926_UART=y)|(PLATFORM=arm32&MACHINE=beaglebone&CONFIG_OMAP_UART=y)|(PLATFORM=arm32&MACHINE=beagleboardxm&CONFIG_OMAP_UART=y)|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&PROCESSOR=sun4v)] CONFIG_SRLN (y)
 
 % EGA support

kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c

@@ -61 +61 @@
 static struct beagleboard {
         amdm37x_irc_regs_t *irc_addr;
-        amdm37x_uart_t uart;
+        omap_uart_t uart;
         amdm37x_gpt_t timer;
 } beagleboard;
@@ -167 +167 @@
 static void bbxm_output_init(void)
 {
+#ifdef CONFIG_OMAP_UART
         /* UART3 is wired to external RS232 connector */
-        const bool ok = amdm37x_uart_init(&beagleboard.uart,
+        const bool ok = omap_uart_init(&beagleboard.uart,
             AMDM37x_UART3_IRQ, AMDM37x_UART3_BASE_ADDRESS, AMDM37x_UART3_SIZE);
         if (ok) {
                 stdout_wire(&beagleboard.uart.outdev);
         }
+#endif
 }
 
 static void bbxm_input_init(void)
 {
+#ifdef CONFIG_OMAP_UART
         srln_instance_t *srln_instance = srln_init();
         if (srln_instance) {
                 indev_t *sink = stdin_wire();
                 indev_t *srln = srln_wire(srln_instance, sink);
-                amdm37x_uart_input_wire(&beagleboard.uart, srln);
+                omap_uart_input_wire(&beagleboard.uart, srln);
                 amdm37x_irc_enable(beagleboard.irc_addr, AMDM37x_UART3_IRQ);
         }
+#endif
 }
 

kernel/arch/arm32/src/mach/beaglebone/beaglebone.c

@@ -68 +68 @@
         am335x_ctrl_module_t  *ctrl_module;
         am335x_timer_t timer;
-        am335x_uart_t uart;
+        omap_uart_t uart;
 } bbone;
 
@@ -195 +195 @@
 static void bbone_output_init(void)
 {
-        const bool ok = am335x_uart_init(&bbone.uart,
+#ifdef CONFIG_OMAP_UART
+        const bool ok = omap_uart_init(&bbone.uart,
             AM335x_UART0_IRQ, AM335x_UART0_BASE_ADDRESS,
             AM335x_UART0_SIZE);
@@ -201 +202 @@
         if (ok)
                 stdout_wire(&bbone.uart.outdev);
+#endif
 }
 
 static void bbone_input_init(void)
 {
+#ifdef CONFIG_OMAP_UART
         srln_instance_t *srln_instance = srln_init();
         if (srln_instance) {
                 indev_t *sink = stdin_wire();
                 indev_t *srln = srln_wire(srln_instance, sink);
-                am335x_uart_input_wire(&bbone.uart, srln);
+                omap_uart_input_wire(&bbone.uart, srln);
                 am335x_irc_enable(bbone.irc_addr, AM335x_UART0_IRQ);
         }
+#endif
 }
 

kernel/genarch/Makefile.inc

@@ -105 +105 @@
 endif
 
-ifeq ($(CONFIG_AM335X_UART),y)
+ifeq ($(CONFIG_OMAP_UART),y)
         GENARCH_SOURCES += \
-                genarch/src/drivers/am335x/uart.c
+                genarch/src/drivers/omap/uart.c
 endif
 
@@ -113 +113 @@
         GENARCH_SOURCES += \
                 genarch/src/drivers/am335x/timer.c
-endif
-
-ifeq ($(CONFIG_AMDM37X_UART),y)
-        GENARCH_SOURCES += \
-                genarch/src/drivers/amdm37x/uart.c
 endif
 

kernel/genarch/include/genarch/drivers/am335x/uart.h

@@ -37 +37 @@
 #define _KERN_AM335X_UART_H_
 
-#include "uart_regs.h"
+#include <genarch/drivers/omap/uart.h>
 
 #define AM335x_UART0_BASE_ADDRESS    0x44E09000
@@ -63 +63 @@
 #define AM335x_UART5_IRQ             46
 
-typedef struct {
-        am335x_uart_regs_t *regs;
-        indev_t *indev;
-        outdev_t outdev;
-        irq_t irq;
-} am335x_uart_t;
-
-#ifdef CONFIG_AM335X_UART
-extern bool am335x_uart_init(am335x_uart_t *uart, inr_t interrupt,
-    uintptr_t addr, size_t size);
-
-extern void am335x_uart_input_wire(am335x_uart_t *uart, indev_t *indev);
-#else
-static bool am335x_uart_init(am335x_uart_t *uart, inr_t interrupt,
-    uintptr_t addr, size_t size)
-{ return true; }
-
-static void am335x_uart_input_wire(am335x_uart_t *uart, indev_t *indev) {}
-#endif
-
 #endif
 

kernel/genarch/include/genarch/drivers/amdm37x/uart.h

@@ -37 +37 @@
 #define _AMDM37x_UART_H_
 
-#include "uart_regs.h"
+#include <genarch/drivers/omap/uart.h>
 
 /* AMDM37x TRM p. 2950 */
@@ -56 +56 @@
 #define AMDM37x_UART4_IRQ   80 /* AMDM37x TRM p. 2418 */
 
-typedef struct {
-        amdm37x_uart_regs_t *regs;
-        indev_t *indev;
-        outdev_t outdev;
-        irq_t irq;
-} amdm37x_uart_t;
-
-
-bool amdm37x_uart_init(amdm37x_uart_t *, inr_t, uintptr_t, size_t);
-void amdm37x_uart_input_wire(amdm37x_uart_t *, indev_t *);
-
 #endif
 

kernel/genarch/src/drivers/omap/uart.c

@@ -32 +32 @@
 /**
  * @file
- * @brief Texas Instruments AM335x on-chip uart serial line driver.
+ * @brief Texas Instruments OMAP on-chip uart serial line driver.
  */
 
-#include <genarch/drivers/am335x/uart.h>
+#include <genarch/drivers/omap/uart.h>
 #include <ddi/device.h>
 #include <str.h>
 #include <mm/km.h>
 
-static void am335x_uart_txb(am335x_uart_t *uart, uint8_t b)
+static void omap_uart_txb(omap_uart_t *uart, uint8_t b)
 {
         /* Wait for buffer */
-        while (uart->regs->ssr & AM335x_UART_SSR_TX_FIFO_FULL_FLAG);
+        while (uart->regs->ssr & OMAP_UART_SSR_TX_FIFO_FULL_FLAG);
         /* Write to the outgoing fifo */
         uart->regs->thr = b;
 }
 
-static void am335x_uart_putchar(outdev_t *dev, wchar_t ch)
+static void omap_uart_putchar(outdev_t *dev, wchar_t ch)
 {
-        am335x_uart_t *uart = dev->data;
+        omap_uart_t *uart = dev->data;
         if (!ascii_check(ch)) {
-                am335x_uart_txb(uart, U_SPECIAL);
+                omap_uart_txb(uart, U_SPECIAL);
         } else {
                 if (ch == '\n')
-                        am335x_uart_txb(uart, '\r');
-                am335x_uart_txb(uart, ch);
+                        omap_uart_txb(uart, '\r');
+                omap_uart_txb(uart, ch);
         }
 }
 
-static outdev_operations_t am335x_uart_ops = {
+static outdev_operations_t omap_uart_ops = {
         .redraw = NULL,
-        .write = am335x_uart_putchar,
+        .write = omap_uart_putchar,
 };
 
-static irq_ownership_t am335x_uart_claim(irq_t *irq)
+static irq_ownership_t omap_uart_claim(irq_t *irq)
 {
         return IRQ_ACCEPT;
 }
 
-static void am335x_uart_handler(irq_t *irq)
+static void omap_uart_handler(irq_t *irq)
 {
-        am335x_uart_t *uart = irq->instance;
+        omap_uart_t *uart = irq->instance;
         while ((uart->regs->rx_fifo_lvl)) {
                 const uint8_t val = uart->regs->rhr;
@@ -81 +81 @@
 }
 
-bool am335x_uart_init(
-    am335x_uart_t *uart, inr_t interrupt, uintptr_t addr, size_t size)
+bool omap_uart_init(
+    omap_uart_t *uart, inr_t interrupt, uintptr_t addr, size_t size)
 {
         ASSERT(uart);
@@ -90 +90 @@
 
         /* Soft reset the port */
-        uart->regs->sysc = AM335x_UART_SYSC_SOFTRESET_FLAG;
-        while (!(uart->regs->syss & AM335x_UART_SYSS_RESETDONE_FLAG));
+        uart->regs->sysc = OMAP_UART_SYSC_SOFTRESET_FLAG;
+        while (!(uart->regs->syss & OMAP_UART_SYSS_RESETDONE_FLAG));
 
         /* Disable the UART module */
-        uart->regs->mdr1 |= AM335x_UART_MDR_MS_DISABLE;
+        uart->regs->mdr1 |= OMAP_UART_MDR_MS_DISABLE;
 
         /* Enable access to EFR register */
@@ -100 +100 @@
 
         /* Enable access to TCL_TLR register */
-        const bool enhanced = uart->regs->efr & AM335x_UART_EFR_ENH_FLAG;
-        uart->regs->efr |= AM335x_UART_EFR_ENH_FLAG; /* Turn on enh. */
+        const bool enhanced = uart->regs->efr & OMAP_UART_EFR_ENH_FLAG;
+        uart->regs->efr |= OMAP_UART_EFR_ENH_FLAG; /* Turn on enh. */
         uart->regs->lcr = 0x80;              /* Config mode A */
 
         /* Set default (val 0) triggers, disable DMA enable FIFOs */
-        const bool tcl_tlr = uart->regs->mcr & AM335x_UART_MCR_TCR_TLR_FLAG;
+        const bool tcl_tlr = uart->regs->mcr & OMAP_UART_MCR_TCR_TLR_FLAG;
         /* Enable access to tcr and tlr registers */
-        uart->regs->mcr |= AM335x_UART_MCR_TCR_TLR_FLAG;
+        uart->regs->mcr |= OMAP_UART_MCR_TCR_TLR_FLAG;
 
         /* Enable FIFOs */
-        uart->regs->fcr = AM335x_UART_FCR_FIFO_EN_FLAG;
+        uart->regs->fcr = OMAP_UART_FCR_FIFO_EN_FLAG;
 
         /* Enable fine granularity for RX FIFO and set trigger level to 1,
          * TX FIFO, trigger level is irrelevant*/
         uart->regs->lcr = 0xBF;              /* Sets config mode B */
-        uart->regs->scr = AM335x_UART_SCR_RX_TRIG_GRANU1_FLAG;
-        uart->regs->tlr = 1 << AM335x_UART_TLR_RX_FIFO_TRIG_SHIFT;
+        uart->regs->scr = OMAP_UART_SCR_RX_TRIG_GRANU1_FLAG;
+        uart->regs->tlr = 1 << OMAP_UART_TLR_RX_FIFO_TRIG_SHIFT;
 
         /* Sets config mode A */
@@ -122 +122 @@
         /* Restore tcl_tlr access flag */
         if (!tcl_tlr)
-                uart->regs->mcr &= ~AM335x_UART_MCR_TCR_TLR_FLAG;
+                uart->regs->mcr &= ~OMAP_UART_MCR_TCR_TLR_FLAG;
         /* Sets config mode B */
         uart->regs->lcr = 0xBF;
@@ -132 +132 @@
         /* Restore enhanced */
         if (!enhanced)
-                uart->regs->efr &= ~AM335x_UART_EFR_ENH_FLAG;
+                uart->regs->efr &= ~OMAP_UART_EFR_ENH_FLAG;
 
         /* Set the DIV_EN bit to 0 */
-        uart->regs->lcr &= ~AM335x_UART_LCR_DIV_EN_FLAG;
+        uart->regs->lcr &= ~OMAP_UART_LCR_DIV_EN_FLAG;
         /* Set the BREAK_EN bit to 0 */
-        uart->regs->lcr &= ~AM335x_UART_LCR_BREAK_EN_FLAG;
+        uart->regs->lcr &= ~OMAP_UART_LCR_BREAK_EN_FLAG;
         /* No parity */
-        uart->regs->lcr &= ~AM335x_UART_LCR_PARITY_EN_FLAG;
+        uart->regs->lcr &= ~OMAP_UART_LCR_PARITY_EN_FLAG;
         /* Stop = 1 bit */
-        uart->regs->lcr &= ~AM335x_UART_LCR_NB_STOP_FLAG;
+        uart->regs->lcr &= ~OMAP_UART_LCR_NB_STOP_FLAG;
         /* Char length = 8 bits */
-        uart->regs->lcr |= AM335x_UART_LCR_CHAR_LENGTH_8BITS;
+        uart->regs->lcr |= OMAP_UART_LCR_CHAR_LENGTH_8BITS;
 
         /* Enable the UART module */
-        uart->regs->mdr1 &= (AM335x_UART_MDR_MS_UART16 &
-            ~AM335x_UART_MDR_MS_MASK);
+        uart->regs->mdr1 &= (OMAP_UART_MDR_MS_UART16 &
+            ~OMAP_UART_MDR_MS_MASK);
 
         /* Disable interrupts */
@@ -153 +153 @@
 
         /* Setup outdev */
-        outdev_initialize("am335x_uart_dev", &uart->outdev, &am335x_uart_ops);
+        outdev_initialize("omap_uart_dev", &uart->outdev, &omap_uart_ops);
         uart->outdev.data = uart;
 
@@ -160 +160 @@
         uart->irq.devno = device_assign_devno();
         uart->irq.inr = interrupt;
-        uart->irq.claim = am335x_uart_claim;
-        uart->irq.handler = am335x_uart_handler;
+        uart->irq.claim = omap_uart_claim;
+        uart->irq.handler = omap_uart_handler;
         uart->irq.instance = uart;
 
@@ -167 +167 @@
 }
 
-void am335x_uart_input_wire(am335x_uart_t *uart, indev_t *indev)
+void omap_uart_input_wire(omap_uart_t *uart, indev_t *indev)
 {
         ASSERT(uart);
@@ -175 +175 @@
         irq_register(&uart->irq);
         /* Enable interrupt on receive */
-        uart->regs->ier |= AM335x_UART_IER_RHR_IRQ_FLAG;
+        uart->regs->ier |= OMAP_UART_IER_RHR_IRQ_FLAG;
 }