Index: kernel/genarch/src/drivers/arm926_uart/arm926_uart.c =================================================================== --- kernel/genarch/src/drivers/arm926_uart/arm926_uart.c (revision b2fa1204c76e1eaec329888181d281aac04ed61e) +++ (revision ) @@ -1,140 +1,0 @@ -/* - * Copyright (c) 2012 Jan Vesely - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup genarch - * @{ - */ -/** - * @file - * @brief ARM926 on-chip UART (PrimeCell UART, PL011) driver. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -static void arm926_uart_sendb(arm926_uart_t *uart, uint8_t byte) -{ - /* Wait for space becoming available in Tx FIFO. */ - // TODO make pio_read accept consts pointers and remove the cast - while ((pio_read_32((ioport32_t*)&uart->regs->flag) & ARM926_UART_FLAG_TXFF_FLAG) != 0) - ; - - pio_write_32(&uart->regs->data, byte); -} - -static void arm926_uart_putchar(outdev_t *dev, wchar_t ch) -{ - arm926_uart_t *uart = dev->data; - - if (!ascii_check(ch)) { - arm926_uart_sendb(uart, U_SPECIAL); - } else { - if (ch == '\n') - arm926_uart_sendb(uart, (uint8_t) '\r'); - arm926_uart_sendb(uart, (uint8_t) ch); - } -} - -static outdev_operations_t arm926_uart_ops = { - .write = arm926_uart_putchar, - .redraw = NULL, -}; - -static irq_ownership_t arm926_uart_claim(irq_t *irq) -{ - return IRQ_ACCEPT; -} - -static void arm926_uart_irq_handler(irq_t *irq) -{ - arm926_uart_t *uart = irq->instance; - - // TODO make pio_read accept const pointers and remove the cast - while ((pio_read_32((ioport32_t*)&uart->regs->flag) & ARM926_UART_FLAG_RXFE_FLAG) == 0) { - /* We ignore all error flags here */ - const uint8_t data = pio_read_32(&uart->regs->data); - if (uart->indev) - indev_push_character(uart->indev, data); - } - /* Ack interrupts */ - pio_write_32(&uart->regs->interrupt_clear, ARM926_UART_INTERRUPT_ALL); -} - -bool arm926_uart_init( - arm926_uart_t *uart, inr_t interrupt, uintptr_t addr, size_t size) -{ - ASSERT(uart); - uart->regs = (void*)km_map(addr, size, PAGE_NOT_CACHEABLE); - - ASSERT(uart->regs); - - /* Enable hw flow control */ - uart->regs->control = 0 | - ARM926_UART_CONTROL_UARTEN_FLAG | - ARM926_UART_CONTROL_RTSE_FLAG | - ARM926_UART_CONTROL_CTSE_FLAG; - - /* Mask all interrupts */ - uart->regs->interrupt_mask = 0; - - outdev_initialize("arm926_uart_dev", &uart->outdev, &arm926_uart_ops); - uart->outdev.data = uart; - - /* Initialize IRQ */ - irq_initialize(&uart->irq); - uart->irq.devno = device_assign_devno(); - uart->irq.inr = interrupt; - uart->irq.claim = arm926_uart_claim; - uart->irq.handler = arm926_uart_irq_handler; - uart->irq.instance = uart; - - return true; -} - -void arm926_uart_input_wire(arm926_uart_t *uart, indev_t *indev) -{ - ASSERT(uart); - ASSERT(indev); - - uart->indev = indev; - irq_register(&uart->irq); - /* Enable receive interrupt */ - uart->regs->interrupt_mask |= ARM926_UART_INTERRUPT_RX_FLAG; -} - -/** @} - */ - Index: kernel/genarch/src/drivers/bcm2835/mbox.c =================================================================== --- kernel/genarch/src/drivers/bcm2835/mbox.c (revision c101dc091b4b9baa318e7f3ece16975f461497b8) +++ kernel/genarch/src/drivers/bcm2835/mbox.c (revision c101dc091b4b9baa318e7f3ece16975f461497b8) @@ -0,0 +1,130 @@ +/* + * Copyright (c) 2013 Beniamino Galvani + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +/** @addtogroup genarch + * @{ + */ +/** + * @file + * @brief BCM2835 mailbox communication routines + */ + +#include +#include +#include + +static void mbox_write(bcm2835_mbox_t *mbox, uint8_t chan, uint32_t value) +{ + while (mbox->status & MBOX_STATUS_FULL) ; + mbox->write = MBOX_COMPOSE(chan, value); +} + +static uint32_t mbox_read(bcm2835_mbox_t *mbox, uint8_t chan) +{ + uint32_t msg; + + do { + while (mbox->status & MBOX_STATUS_EMPTY) ; + msg = mbox->read; + } while (MBOX_MSG_CHAN(msg) != chan); + + return MBOX_MSG_VALUE(msg); +} + +bool bcm2835_prop_get_memory(uint32_t *base, uint32_t *size) +{ + bool ret; + MBOX_BUFF_ALLOC(req, mbox_getmem_buf_t); + + req->buf_hdr.size = sizeof(mbox_getmem_buf_t); + req->buf_hdr.code = MBOX_PROP_CODE_REQ; + req->tag_hdr.tag_id = TAG_GET_ARM_MEMORY; + req->tag_hdr.buf_size = sizeof(mbox_tag_getmem_resp_t); + req->tag_hdr.val_len = 0; + req->zero = 0; + + mbox_write((bcm2835_mbox_t *)BCM2835_MBOX0_ADDR, + MBOX_CHAN_PROP_A2V, KA2VCA((uint32_t)req)); + mbox_read((bcm2835_mbox_t *)BCM2835_MBOX0_ADDR, + MBOX_CHAN_PROP_A2V); + + if (req->buf_hdr.code == MBOX_PROP_CODE_RESP_OK) { + *base = req->data.base; + *size = req->data.size; + ret = true; + } else { + ret = false; + } + + return ret; +} + +bool bcm2835_fb_init(fb_properties_t *prop) +{ + bcm2835_mbox_t *fb_mbox; + bool ret = false; + MBOX_BUFF_ALLOC(fb_desc, bcm2835_fb_desc_t); + + fb_mbox = (void *) km_map(BCM2835_MBOX0_ADDR, sizeof(bcm2835_mbox_t), + PAGE_NOT_CACHEABLE); + + fb_desc->width = 640; + fb_desc->height = 480; + fb_desc->virt_width = fb_desc->width; + fb_desc->virt_height = fb_desc->height; + fb_desc->pitch = 0; /* Set by VC */ + fb_desc->bpp = 16; + fb_desc->x_offset = 0; + fb_desc->y_offset = 0; + fb_desc->addr = 0; /* Set by VC */ + fb_desc->size = 0; /* Set by VC */ + + mbox_write(fb_mbox, MBOX_CHAN_FB, KA2VCA(fb_desc)); + + if (mbox_read(fb_mbox, MBOX_CHAN_FB)) { + printf("BCM2835 framebuffer initialization failed\n"); + goto out; + } + + prop->addr = fb_desc->addr; + prop->offset = 0; + prop->x = fb_desc->width; + prop->y = fb_desc->height; + prop->scan = fb_desc->pitch; + prop->visual = VISUAL_RGB_5_6_5_LE; + + printf("BCM2835 framebuffer at 0x%08x (%dx%d)\n", prop->addr, + prop->x, prop->y); + ret = true; +out: + km_unmap((uintptr_t)fb_mbox, sizeof(bcm2835_mbox_t)); + return ret; +} + +/** + * @} + */ Index: kernel/genarch/src/drivers/pl011/pl011.c =================================================================== --- kernel/genarch/src/drivers/pl011/pl011.c (revision c101dc091b4b9baa318e7f3ece16975f461497b8) +++ kernel/genarch/src/drivers/pl011/pl011.c (revision c101dc091b4b9baa318e7f3ece16975f461497b8) @@ -0,0 +1,150 @@ +/* + * Copyright (c) 2012 Jan Vesely + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup genarch + * @{ + */ +/** + * @file + * @brief ARM PrimeCell PL011 UART driver. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static void pl011_uart_sendb(pl011_uart_t *uart, uint8_t byte) +{ + /* Wait for space becoming available in Tx FIFO. */ + // TODO make pio_read accept consts pointers and remove the cast + while ((pio_read_32((ioport32_t*)&uart->regs->flag) & PL011_UART_FLAG_TXFF_FLAG) != 0) + ; + + pio_write_32(&uart->regs->data, byte); +} + +static void pl011_uart_putchar(outdev_t *dev, wchar_t ch) +{ + pl011_uart_t *uart = dev->data; + + if (!ascii_check(ch)) { + pl011_uart_sendb(uart, U_SPECIAL); + } else { + if (ch == '\n') + pl011_uart_sendb(uart, (uint8_t) '\r'); + pl011_uart_sendb(uart, (uint8_t) ch); + } +} + +static outdev_operations_t pl011_uart_ops = { + .write = pl011_uart_putchar, + .redraw = NULL, +}; + +static irq_ownership_t pl011_uart_claim(irq_t *irq) +{ + return IRQ_ACCEPT; +} + +static void pl011_uart_irq_handler(irq_t *irq) +{ + pl011_uart_t *uart = irq->instance; + + // TODO make pio_read accept const pointers and remove the cast + while ((pio_read_32((ioport32_t*)&uart->regs->flag) & PL011_UART_FLAG_RXFE_FLAG) == 0) { + /* We ignore all error flags here */ + const uint8_t data = pio_read_32(&uart->regs->data); + if (uart->indev) + indev_push_character(uart->indev, data); + } + /* Ack interrupts */ + pio_write_32(&uart->regs->interrupt_clear, PL011_UART_INTERRUPT_ALL); +} + +bool pl011_uart_init(pl011_uart_t *uart, inr_t interrupt, uintptr_t addr) +{ + ASSERT(uart); + uart->regs = (void*)km_map(addr, sizeof(pl011_uart_regs_t), + PAGE_NOT_CACHEABLE); + ASSERT(uart->regs); + + /* Disable UART */ + uart->regs->control &= ~ PL011_UART_CONTROL_UARTEN_FLAG; + + /* Enable hw flow control */ + uart->regs->control |= + PL011_UART_CONTROL_RTSE_FLAG | + PL011_UART_CONTROL_CTSE_FLAG; + + /* Mask all interrupts */ + uart->regs->interrupt_mask = 0; + /* Clear interrupts */ + uart->regs->interrupt_clear = PL011_UART_INTERRUPT_ALL; + /* Enable UART, TX and RX */ + uart->regs->control |= + PL011_UART_CONTROL_UARTEN_FLAG | + PL011_UART_CONTROL_TXE_FLAG | + PL011_UART_CONTROL_RXE_FLAG; + + outdev_initialize("pl011_uart_dev", &uart->outdev, &pl011_uart_ops); + uart->outdev.data = uart; + + /* Initialize IRQ */ + irq_initialize(&uart->irq); + uart->irq.devno = device_assign_devno(); + uart->irq.inr = interrupt; + uart->irq.claim = pl011_uart_claim; + uart->irq.handler = pl011_uart_irq_handler; + uart->irq.instance = uart; + + return true; +} + +void pl011_uart_input_wire(pl011_uart_t *uart, indev_t *indev) +{ + ASSERT(uart); + ASSERT(indev); + + uart->indev = indev; + irq_register(&uart->irq); + /* Enable receive interrupts */ + uart->regs->interrupt_mask |= + PL011_UART_INTERRUPT_RX_FLAG | + PL011_UART_INTERRUPT_RT_FLAG; +} + +/** @} + */ +