Index: HelenOS.config =================================================================== --- HelenOS.config (revision c88250553aba5820e5ea6bf156edf1ed176d8737) +++ HelenOS.config (revision 44b2b78be3d89c7a81b12bc1276fd80e28175892) @@ -505,4 +505,7 @@ ! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&MACHINE=beagleboardxm] CONFIG_AMDM37X_UART (y/n) +% Support for BCM2835 mailbox +! [PLATFORM=arm32&MACHINE=raspberrypi] CONFIG_BCM2835_MAILBOX (y/n) + % Support for i8042 controller ! [CONFIG_PC_KBD=y] CONFIG_I8042 (y) Index: kernel/arch/arm32/src/mach/raspberrypi/raspberrypi.c =================================================================== --- kernel/arch/arm32/src/mach/raspberrypi/raspberrypi.c (revision c88250553aba5820e5ea6bf156edf1ed176d8737) +++ kernel/arch/arm32/src/mach/raspberrypi/raspberrypi.c (revision 44b2b78be3d89c7a81b12bc1276fd80e28175892) @@ -39,4 +39,5 @@ #include #include +#include #include #include @@ -50,12 +51,7 @@ #include -#define RPI_MEMORY_START 0 -/* - * TODO: size of available memory depends on hw model and - * bootloader configuration, we should detect it somehow. - * 128MB should be a safe value for now. - * */ -#define RPI_MEMORY_SIZE 0x08000000 -#define RPI_MEMORY_SKIP 0x8000 +#define RPI_DEFAULT_MEMORY_START 0 +#define RPI_DEFAULT_MEMORY_SIZE 0x08000000 +#define RPI_MEMORY_SKIP 0x8000 static void raspberrypi_init(void); @@ -143,6 +139,14 @@ static void raspberrypi_get_memory_extents(uintptr_t *start, size_t *size) { - *start = RPI_MEMORY_START + RPI_MEMORY_SKIP; - *size = RPI_MEMORY_SIZE - RPI_MEMORY_SKIP; + uint32_t mbase, msize; + + if (bcm2835_prop_get_memory(&mbase, &msize)) { + *start = mbase + RPI_MEMORY_SKIP; + *size = msize - RPI_MEMORY_SKIP; + } else { + /* Stick to safe default values */ + *start = RPI_DEFAULT_MEMORY_START + RPI_MEMORY_SKIP; + *size = RPI_DEFAULT_MEMORY_SIZE - RPI_MEMORY_SKIP; + } } Index: kernel/genarch/Makefile.inc =================================================================== --- kernel/genarch/Makefile.inc (revision c88250553aba5820e5ea6bf156edf1ed176d8737) +++ kernel/genarch/Makefile.inc (revision 44b2b78be3d89c7a81b12bc1276fd80e28175892) @@ -121,4 +121,9 @@ endif +ifeq ($(CONFIG_BCM2835_MAILBOX),y) + GENARCH_SOURCES += \ + genarch/src/drivers/bcm2835/mbox.c +endif + ifeq ($(CONFIG_VIA_CUDA),y) GENARCH_SOURCES += \ Index: kernel/genarch/include/genarch/drivers/bcm2835/mbox.h =================================================================== --- kernel/genarch/include/genarch/drivers/bcm2835/mbox.h (revision 44b2b78be3d89c7a81b12bc1276fd80e28175892) +++ kernel/genarch/include/genarch/drivers/bcm2835/mbox.h (revision 44b2b78be3d89c7a81b12bc1276fd80e28175892) @@ -0,0 +1,127 @@ +/* + * 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 + */ + +#ifndef _BCM2835_MBOX_H_ +#define _BCM2835_MBOX_H_ + +#include +#include + +#define BCM2835_MBOX0_ADDR 0x2000B880 + +enum { + MBOX_CHAN_PM = 0, + MBOX_CHAN_FB = 1, + MBOX_CHAN_UART = 2, + MBOX_CHAN_VCHIQ = 3, + MBOX_CHAN_LED = 4, + MBOX_CHAN_BTN = 5, + MBOX_CHAN_TS = 6, + MBOX_CHAN_PROP_A2V = 8, + MBOX_CHAN_PROP_V2A = 9 +}; + +enum { + TAG_GET_FW_REV = 0x00000001, + TAG_GET_BOARD_MODEL = 0x00010001, + TAG_GET_BOARD_REV = 0x00010002, + TAG_GET_BOARD_MAC = 0x00010003, + TAG_GET_BOARD_SERIAL = 0x00010004, + TAG_GET_ARM_MEMORY = 0x00010005, + TAG_GET_VC_MEMORY = 0x00010006, + TAG_GET_CLOCKS = 0x00010007, + TAG_GET_CMD_LINE = 0x00050001, +}; + +enum { + MBOX_PROP_CODE_REQ = 0x00000000, + MBOX_PROP_CODE_RESP_OK = 0x80000000, + MBOX_PROP_CODE_RESP_ERR = 0x80000001 +}; + +#define MBOX_STATUS_FULL (1 << 31) +#define MBOX_STATUS_EMPTY (1 << 30) + +#define MBOX_COMPOSE(chan, value) (((chan) & 0xf) | ((value) & ~0xf)) +#define MBOX_MSG_CHAN(msg) ((msg) & 0xf) +#define MBOX_MSG_VALUE(msg) ((msg) & ~0xf) + +#define KA2VC(addr) (KA2PA(addr) + 0x40000000) + +#define MBOX_ADDR_ALIGN 16 + +#define ALLOC_PROP_BUFFER(name,type) \ + char _tmp[sizeof(type) + MBOX_ADDR_ALIGN] = { 0 }; \ + type *name = (type *)ALIGN_UP((uint32_t)_tmp, MBOX_ADDR_ALIGN); + +typedef struct { + ioport32_t read; + ioport32_t unused[3]; + ioport32_t peek; + ioport32_t sender; + ioport32_t status; + ioport32_t config; + ioport32_t write; +} bcm2835_mbox_t; + +typedef struct { + ioport32_t size; + ioport32_t code; +} mbox_prop_buf_hdr_t; + +typedef struct { + ioport32_t tag_id; + ioport32_t buf_size; + ioport32_t val_len; +} mbox_tag_hdr_t; + +typedef struct { + ioport32_t base; + ioport32_t size; +} mbox_tag_getmem_resp_t; + +typedef struct { + mbox_prop_buf_hdr_t buf_hdr; + mbox_tag_hdr_t tag_hdr; + mbox_tag_getmem_resp_t data; + uint32_t zero; +} mbox_getmem_buf_t; + +bool bcm2835_prop_get_memory(uint32_t *base, uint32_t *size); + +#endif +/** + * @} + */ Index: kernel/genarch/src/drivers/bcm2835/mbox.c =================================================================== --- kernel/genarch/src/drivers/bcm2835/mbox.c (revision 44b2b78be3d89c7a81b12bc1276fd80e28175892) +++ kernel/genarch/src/drivers/bcm2835/mbox.c (revision 44b2b78be3d89c7a81b12bc1276fd80e28175892) @@ -0,0 +1,91 @@ +/* + * 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 + +static void mbox_write(bcm2835_mbox_t *mbox, uint8_t chan, uint32_t value) +{ + if (!mbox) + mbox = (bcm2835_mbox_t *)BCM2835_MBOX0_ADDR; + + 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; + + if (!mbox) + mbox = (bcm2835_mbox_t *)BCM2835_MBOX0_ADDR; + + 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; + ALLOC_PROP_BUFFER(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(NULL, MBOX_CHAN_PROP_A2V, KA2VC((uint32_t)req)); + mbox_read(NULL, 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; +} + +/** + * @} + */