Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 30 Aug 2012 20:59:37 +0000 (UTC)
From:      Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r239922 - in head/sys: arm/broadcom arm/broadcom/bcm2835 arm/conf boot/fdt/dts
Message-ID:  <201208302059.q7UKxbpT013259@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gonzo
Date: Thu Aug 30 20:59:37 2012
New Revision: 239922
URL: http://svn.freebsd.org/changeset/base/239922

Log:
  Add barebone Raspberry Pi port. Supported parts:
    - Interrupts controller
    - Watchdog
    - System timer
    - Framebuffer (hardcoded resolution/bpp)

Added:
  head/sys/arm/broadcom/
  head/sys/arm/broadcom/bcm2835/
  head/sys/arm/broadcom/bcm2835/bcm2835_fb.c   (contents, props changed)
  head/sys/arm/broadcom/bcm2835/bcm2835_intr.c   (contents, props changed)
  head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c   (contents, props changed)
  head/sys/arm/broadcom/bcm2835/bcm2835_mbox.c   (contents, props changed)
  head/sys/arm/broadcom/bcm2835/bcm2835_mbox.h   (contents, props changed)
  head/sys/arm/broadcom/bcm2835/bcm2835_systimer.c   (contents, props changed)
  head/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h   (contents, props changed)
  head/sys/arm/broadcom/bcm2835/bcm2835_wdog.c   (contents, props changed)
  head/sys/arm/broadcom/bcm2835/bcm2835_wdog.h   (contents, props changed)
  head/sys/arm/broadcom/bcm2835/bus_space.c   (contents, props changed)
  head/sys/arm/broadcom/bcm2835/common.c   (contents, props changed)
  head/sys/arm/broadcom/bcm2835/files.bcm2835   (contents, props changed)
  head/sys/arm/conf/RPI-B   (contents, props changed)
  head/sys/boot/fdt/dts/bcm2835-rpi-b.dts   (contents, props changed)

Added: head/sys/arm/broadcom/bcm2835/bcm2835_fb.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/arm/broadcom/bcm2835/bcm2835_fb.c	Thu Aug 30 20:59:37 2012	(r239922)
@@ -0,0 +1,714 @@
+/*-
+ * Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
+ *
+ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bio.h>
+#include <sys/bus.h>
+#include <sys/conf.h>
+#include <sys/endian.h>
+#include <sys/kernel.h>
+#include <sys/kthread.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
+#include <sys/queue.h>
+#include <sys/resource.h>
+#include <sys/rman.h>
+#include <sys/time.h>
+#include <sys/timetc.h>
+#include <sys/fbio.h>
+#include <sys/consio.h>
+
+#include <sys/kdb.h>
+
+#include <machine/bus.h>
+#include <machine/cpu.h>
+#include <machine/cpufunc.h>
+#include <machine/resource.h>
+#include <machine/frame.h>
+#include <machine/intr.h>
+
+#include <dev/fdt/fdt_common.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#include <dev/fb/fbreg.h>
+#include <dev/syscons/syscons.h>
+
+#include <arm/broadcom/bcm2835/bcm2835_mbox.h>
+#include <arm/broadcom/bcm2835/bcm2835_vcbus.h>
+
+#define	BCMFB_FONT_HEIGHT	16
+
+#define FB_WIDTH		640
+#define FB_HEIGHT		480
+
+struct bcm_fb_config {
+	uint32_t	xres;
+	uint32_t	yres;
+	uint32_t	vxres;
+	uint32_t	vyres;
+	uint32_t	pitch;
+	uint32_t	bpp;
+	uint32_t	xoffset;
+	uint32_t	yoffset;
+	/* Filled by videocore */
+	uint32_t	base;
+	uint32_t	screen_size;
+};
+
+struct bcmsc_softc {
+	device_t		dev;
+	struct cdev *		cdev;
+	struct mtx		mtx;
+	bus_dma_tag_t		dma_tag;
+	bus_dmamap_t		dma_map;
+	struct bcm_fb_config*	fb_config;
+	bus_addr_t		fb_config_phys;
+	struct intr_config_hook	init_hook;
+
+};
+
+struct video_adapter_softc {
+	/* Videoadpater part */
+	video_adapter_t	va;
+	int		console;
+
+	intptr_t	fb_addr;
+	unsigned int	fb_size;
+
+	unsigned int	height;
+	unsigned int	width;
+	unsigned int	stride;
+
+	unsigned int	xmargin;
+	unsigned int	ymargin;
+
+	unsigned char	*font;
+	int		initialized;
+};
+
+static struct bcmsc_softc *bcmsc_softc;
+static struct video_adapter_softc va_softc;
+
+#define	bcm_fb_lock(_sc)	mtx_lock(&(_sc)->mtx)
+#define	bcm_fb_unlock(_sc)	mtx_unlock(&(_sc)->mtx)
+#define	bcm_fb_lock_assert(sc)	mtx_assert(&(_sc)->mtx, MA_OWNED)
+
+static int bcm_fb_probe(device_t);
+static int bcm_fb_attach(device_t);
+static void bcm_fb_dmamap_cb(void *arg, bus_dma_segment_t *segs, int nseg, int err);
+
+static void
+bcm_fb_init(void *arg)
+{
+	struct bcmsc_softc *sc = arg;
+	struct video_adapter_softc *va_sc = &va_softc;
+	int err;
+	volatile struct bcm_fb_config*	fb_config = sc->fb_config;
+
+	/* TODO: replace it with FDT stuff */
+	fb_config->xres = FB_WIDTH;
+	fb_config->yres = FB_HEIGHT;
+	fb_config->vxres = 0;
+	fb_config->vyres = 0;
+	fb_config->xoffset = 0;
+	fb_config->yoffset = 0;
+	fb_config->bpp = 24;
+	fb_config->base = 0;
+	fb_config->pitch = 0;
+	fb_config->screen_size = 0;
+
+	bus_dmamap_sync(sc->dma_tag, sc->dma_map,
+		BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
+	bcm_mbox_write(BCM2835_MBOX_CHAN_FB, sc->fb_config_phys);
+	bcm_mbox_read(BCM2835_MBOX_CHAN_FB, &err);
+	bus_dmamap_sync(sc->dma_tag, sc->dma_map,
+		BUS_DMASYNC_POSTREAD);
+
+	if (err == 0) {
+		device_printf(sc->dev, "%dx%d(%dx%d@%d,%d) %dbpp\n", 
+			fb_config->xres, fb_config->yres,
+			fb_config->vxres, fb_config->vyres,
+			fb_config->xoffset, fb_config->yoffset,
+			fb_config->bpp);
+
+
+		device_printf(sc->dev, "pitch %d, base 0x%08x, screen_size %d\n", 
+			fb_config->pitch, fb_config->base,
+			fb_config->screen_size);
+
+		if (fb_config->base) {
+			va_sc->fb_addr = (intptr_t)pmap_mapdev(fb_config->base, fb_config->screen_size);
+			va_sc->fb_size = fb_config->screen_size;
+			va_sc->stride = fb_config->pitch;
+		}
+	}
+	else
+		device_printf(sc->dev, "Failed to set framebuffer info\n");
+
+	config_intrhook_disestablish(&sc->init_hook);
+}
+
+static int
+bcm_fb_probe(device_t dev)
+{
+	int error;
+
+	if (!ofw_bus_is_compatible(dev, "broadcom,bcm2835-fb"))
+		return (ENXIO);
+
+	device_set_desc(dev, "BCM2835 framebuffer device");
+
+	error = sc_probe_unit(device_get_unit(dev), 
+	    device_get_flags(dev) | SC_AUTODETECT_KBD);
+
+	if (error != 0)
+		return (error);
+
+	return (BUS_PROBE_DEFAULT);
+}
+
+static int
+bcm_fb_attach(device_t dev)
+{
+	struct bcmsc_softc *sc = device_get_softc(dev);
+	int dma_size = sizeof(struct bcm_fb_config);
+	int err;
+
+	if (bcmsc_softc)
+		return (ENXIO);
+
+	bcmsc_softc = sc;
+
+	sc->dev = dev;
+	mtx_init(&sc->mtx, "bcm2835fb", "fb", MTX_DEF);
+
+	err = bus_dma_tag_create(
+	    bus_get_dma_tag(sc->dev),
+	    PAGE_SIZE, 0,		/* alignment, boundary */
+	    BUS_SPACE_MAXADDR_32BIT,	/* lowaddr */
+	    BUS_SPACE_MAXADDR,		/* highaddr */
+	    NULL, NULL,			/* filter, filterarg */
+	    dma_size, 1,		/* maxsize, nsegments */
+	    dma_size, 0,		/* maxsegsize, flags */
+	    NULL, NULL,			/* lockfunc, lockarg */
+	    &sc->dma_tag);
+
+	err = bus_dmamem_alloc(sc->dma_tag, (void **)&sc->fb_config,
+	    0, &sc->dma_map);
+	if (err) {
+		device_printf(dev, "cannot allocate framebuffer\n");
+		goto fail;
+	}
+
+	err = bus_dmamap_load(sc->dma_tag, sc->dma_map, sc->fb_config,
+	    dma_size, bcm_fb_dmamap_cb, &sc->fb_config_phys, BUS_DMA_NOWAIT);
+
+	if (err) {
+		device_printf(dev, "cannot load DMA map\n");
+		goto fail;
+	}
+
+	err = (sc_attach_unit(device_get_unit(dev),
+	    device_get_flags(dev) | SC_AUTODETECT_KBD));
+
+	if (err) {
+		device_printf(dev, "failed to attach syscons\n");
+		goto fail;
+	}
+
+	/* 
+	 * We have to wait until interrupts are enabled. 
+	 * Mailbox relies on it to get data from VideoCore
+	 */
+        sc->init_hook.ich_func = bcm_fb_init;
+        sc->init_hook.ich_arg = sc;
+
+        if (config_intrhook_establish(&sc->init_hook) != 0) {
+		device_printf(dev, "failed to establish intrhook\n");
+                return (ENOMEM);
+	}
+
+	return (0);
+
+fail:
+	return (ENXIO);
+}
+
+
+static void
+bcm_fb_dmamap_cb(void *arg, bus_dma_segment_t *segs, int nseg, int err)
+{
+	bus_addr_t *addr;
+
+	if (err)
+		return;
+
+	addr = (bus_addr_t*)arg;
+	*addr = PHYS_TO_VCBUS(segs[0].ds_addr);
+}
+
+static device_method_t bcm_fb_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,		bcm_fb_probe),
+	DEVMETHOD(device_attach,	bcm_fb_attach),
+
+	{ 0, 0 }
+};
+
+static devclass_t bcm_fb_devclass;
+
+static driver_t bcm_fb_driver = {
+	"fb",
+	bcm_fb_methods,
+	sizeof(struct bcmsc_softc),
+};
+
+DRIVER_MODULE(bcm2835fb, simplebus, bcm_fb_driver, bcm_fb_devclass, 0, 0);
+
+/*
+ * Video driver routines and glue.
+ */
+static int			bcmfb_configure(int);
+static vi_probe_t		bcmfb_probe;
+static vi_init_t		bcmfb_init;
+static vi_get_info_t		bcmfb_get_info;
+static vi_query_mode_t		bcmfb_query_mode;
+static vi_set_mode_t		bcmfb_set_mode;
+static vi_save_font_t		bcmfb_save_font;
+static vi_load_font_t		bcmfb_load_font;
+static vi_show_font_t		bcmfb_show_font;
+static vi_save_palette_t	bcmfb_save_palette;
+static vi_load_palette_t	bcmfb_load_palette;
+static vi_set_border_t		bcmfb_set_border;
+static vi_save_state_t		bcmfb_save_state;
+static vi_load_state_t		bcmfb_load_state;
+static vi_set_win_org_t		bcmfb_set_win_org;
+static vi_read_hw_cursor_t	bcmfb_read_hw_cursor;
+static vi_set_hw_cursor_t	bcmfb_set_hw_cursor;
+static vi_set_hw_cursor_shape_t	bcmfb_set_hw_cursor_shape;
+static vi_blank_display_t	bcmfb_blank_display;
+static vi_mmap_t		bcmfb_mmap;
+static vi_ioctl_t		bcmfb_ioctl;
+static vi_clear_t		bcmfb_clear;
+static vi_fill_rect_t		bcmfb_fill_rect;
+static vi_bitblt_t		bcmfb_bitblt;
+static vi_diag_t		bcmfb_diag;
+static vi_save_cursor_palette_t	bcmfb_save_cursor_palette;
+static vi_load_cursor_palette_t	bcmfb_load_cursor_palette;
+static vi_copy_t		bcmfb_copy;
+static vi_putp_t		bcmfb_putp;
+static vi_putc_t		bcmfb_putc;
+static vi_puts_t		bcmfb_puts;
+static vi_putm_t		bcmfb_putm;
+
+static video_switch_t bcmfbvidsw = {
+	.probe			= bcmfb_probe,
+	.init			= bcmfb_init,
+	.get_info		= bcmfb_get_info,
+	.query_mode		= bcmfb_query_mode,
+	.set_mode		= bcmfb_set_mode,
+	.save_font		= bcmfb_save_font,
+	.load_font		= bcmfb_load_font,
+	.show_font		= bcmfb_show_font,
+	.save_palette		= bcmfb_save_palette,
+	.load_palette		= bcmfb_load_palette,
+	.set_border		= bcmfb_set_border,
+	.save_state		= bcmfb_save_state,
+	.load_state		= bcmfb_load_state,
+	.set_win_org		= bcmfb_set_win_org,
+	.read_hw_cursor		= bcmfb_read_hw_cursor,
+	.set_hw_cursor		= bcmfb_set_hw_cursor,
+	.set_hw_cursor_shape	= bcmfb_set_hw_cursor_shape,
+	.blank_display		= bcmfb_blank_display,
+	.mmap			= bcmfb_mmap,
+	.ioctl			= bcmfb_ioctl,
+	.clear			= bcmfb_clear,
+	.fill_rect		= bcmfb_fill_rect,
+	.bitblt			= bcmfb_bitblt,
+	.diag			= bcmfb_diag,
+	.save_cursor_palette	= bcmfb_save_cursor_palette,
+	.load_cursor_palette	= bcmfb_load_cursor_palette,
+	.copy			= bcmfb_copy,
+	.putp			= bcmfb_putp,
+	.putc			= bcmfb_putc,
+	.puts			= bcmfb_puts,
+	.putm			= bcmfb_putm,
+};
+
+VIDEO_DRIVER(bcmfb, bcmfbvidsw, bcmfb_configure);
+
+extern sc_rndr_sw_t txtrndrsw;
+RENDERER(bcmfb, 0, txtrndrsw, gfb_set);
+RENDERER_MODULE(bcmfb, gfb_set);
+
+static uint16_t bcmfb_static_window[ROW*COL];
+extern u_char dflt_font_16[];
+
+static int
+bcmfb_configure(int flags)
+{
+	struct video_adapter_softc *sc;
+
+	sc = &va_softc;
+
+	if (sc->initialized)
+		return 0;
+
+	sc->height = FB_HEIGHT;
+	sc->width = FB_WIDTH;
+
+	bcmfb_init(0, &sc->va, 0);
+
+	sc->initialized = 1;
+
+	return (0);
+}
+
+static int
+bcmfb_probe(int unit, video_adapter_t **adp, void *arg, int flags)
+{
+
+	return (0);
+}
+
+static int
+bcmfb_init(int unit, video_adapter_t *adp, int flags)
+{
+	struct video_adapter_softc *sc;
+	video_info_t *vi;
+
+	sc = (struct video_adapter_softc *)adp;
+	vi = &adp->va_info;
+
+	vid_init_struct(adp, "bcmfb", -1, unit);
+
+	sc->font = dflt_font_16;
+	vi->vi_cheight = BCMFB_FONT_HEIGHT;
+	vi->vi_cwidth = 8;
+	vi->vi_width = sc->width/8;
+	vi->vi_height = sc->height/vi->vi_cheight;
+
+	/*
+	 * Clamp width/height to syscons maximums
+	 */
+	if (vi->vi_width > COL)
+		vi->vi_width = COL;
+	if (vi->vi_height > ROW)
+		vi->vi_height = ROW;
+
+	sc->xmargin = (sc->width - (vi->vi_width * vi->vi_cwidth)) / 2;
+	sc->ymargin = (sc->height - (vi->vi_height * vi->vi_cheight))/2;
+
+	adp->va_window = (vm_offset_t) bcmfb_static_window;
+	adp->va_flags |= V_ADP_FONT /* | V_ADP_COLOR | V_ADP_MODECHANGE */;
+
+	vid_register(&sc->va);
+
+	return (0);
+}
+
+static int
+bcmfb_get_info(video_adapter_t *adp, int mode, video_info_t *info)
+{
+	bcopy(&adp->va_info, info, sizeof(*info));
+	return (0);
+}
+
+static int
+bcmfb_query_mode(video_adapter_t *adp, video_info_t *info)
+{
+	return (0);
+}
+
+static int
+bcmfb_set_mode(video_adapter_t *adp, int mode)
+{
+	return (0);
+}
+
+static int
+bcmfb_save_font(video_adapter_t *adp, int page, int size, int width,
+    u_char *data, int c, int count)
+{
+	return (0);
+}
+
+static int
+bcmfb_load_font(video_adapter_t *adp, int page, int size, int width,
+    u_char *data, int c, int count)
+{
+	struct video_adapter_softc *sc = (struct video_adapter_softc *)adp;
+
+	sc->font = data;
+
+	return (0);
+}
+
+static int
+bcmfb_show_font(video_adapter_t *adp, int page)
+{
+	return (0);
+}
+
+static int
+bcmfb_save_palette(video_adapter_t *adp, u_char *palette)
+{
+	return (0);
+}
+
+static int
+bcmfb_load_palette(video_adapter_t *adp, u_char *palette)
+{
+	return (0);
+}
+
+static int
+bcmfb_set_border(video_adapter_t *adp, int border)
+{
+	return (bcmfb_blank_display(adp, border));
+}
+
+static int
+bcmfb_save_state(video_adapter_t *adp, void *p, size_t size)
+{
+	return (0);
+}
+
+static int
+bcmfb_load_state(video_adapter_t *adp, void *p)
+{
+	return (0);
+}
+
+static int
+bcmfb_set_win_org(video_adapter_t *adp, off_t offset)
+{
+	return (0);
+}
+
+static int
+bcmfb_read_hw_cursor(video_adapter_t *adp, int *col, int *row)
+{
+	*col = *row = 0;
+
+	return (0);
+}
+
+static int
+bcmfb_set_hw_cursor(video_adapter_t *adp, int col, int row)
+{
+	return (0);
+}
+
+static int
+bcmfb_set_hw_cursor_shape(video_adapter_t *adp, int base, int height,
+    int celsize, int blink)
+{
+	return (0);
+}
+
+static int
+bcmfb_blank_display(video_adapter_t *adp, int mode)
+{
+
+	return (0);
+}
+
+static int
+bcmfb_mmap(video_adapter_t *adp, vm_ooffset_t offset, vm_paddr_t *paddr,
+    int prot, vm_memattr_t *memattr)
+{
+	struct video_adapter_softc *sc;
+
+	sc = (struct video_adapter_softc *)adp;
+
+	/*
+	 * This might be a legacy VGA mem request: if so, just point it at the
+	 * framebuffer, since it shouldn't be touched
+	 */
+	if (offset < sc->stride*sc->height) {
+		*paddr = sc->fb_addr + offset;
+		return (0);
+	}
+
+	return (EINVAL);
+}
+
+static int
+bcmfb_ioctl(video_adapter_t *adp, u_long cmd, caddr_t data)
+{
+
+	return (0);
+}
+
+static int
+bcmfb_clear(video_adapter_t *adp)
+{
+
+	return (bcmfb_blank_display(adp, 0));
+}
+
+static int
+bcmfb_fill_rect(video_adapter_t *adp, int val, int x, int y, int cx, int cy)
+{
+
+	return (0);
+}
+
+static int
+bcmfb_bitblt(video_adapter_t *adp, ...)
+{
+
+	return (0);
+}
+
+static int
+bcmfb_diag(video_adapter_t *adp, int level)
+{
+
+	return (0);
+}
+
+static int
+bcmfb_save_cursor_palette(video_adapter_t *adp, u_char *palette)
+{
+
+	return (0);
+}
+
+static int
+bcmfb_load_cursor_palette(video_adapter_t *adp, u_char *palette)
+{
+
+	return (0);
+}
+
+static int
+bcmfb_copy(video_adapter_t *adp, vm_offset_t src, vm_offset_t dst, int n)
+{
+
+	return (0);
+}
+
+static int
+bcmfb_putp(video_adapter_t *adp, vm_offset_t off, uint32_t p, uint32_t a,
+    int size, int bpp, int bit_ltor, int byte_ltor)
+{
+
+	return (0);
+}
+
+static int
+bcmfb_putc(video_adapter_t *adp, vm_offset_t off, uint8_t c, uint8_t a)
+{
+	struct video_adapter_softc *sc;
+	int row;
+	int col;
+	int i, j, k;
+	uint8_t *addr;
+	u_char *p;
+	uint8_t fg, bg, color;
+
+	sc = (struct video_adapter_softc *)adp;
+
+	if (sc->fb_addr == 0)
+		return (0);
+
+	row = (off / adp->va_info.vi_width) * adp->va_info.vi_cheight;
+	col = (off % adp->va_info.vi_width) * adp->va_info.vi_cwidth;
+	p = sc->font + c*BCMFB_FONT_HEIGHT;
+	addr = (uint8_t *)sc->fb_addr
+	    + (row + sc->ymargin)*(sc->stride)
+	    + 3 * (col + sc->xmargin);
+
+	/*
+	 * FIXME: hardcoded
+	 */
+	bg = 0x00;
+	fg = 0x80;
+
+	for (i = 0; i < BCMFB_FONT_HEIGHT; i++) {
+		for (j = 0, k = 7; j < 8; j++, k--) {
+			if ((p[i] & (1 << k)) == 0)
+				color = bg;
+			else
+				color = fg;
+
+			addr[3*j] = color;
+			addr[3*j+1] = color;
+			addr[3*j+2] = color;
+		}
+
+		addr += (sc->stride);
+	}
+
+        return (0);
+}
+
+static int
+bcmfb_puts(video_adapter_t *adp, vm_offset_t off, u_int16_t *s, int len)
+{
+	int i;
+
+	for (i = 0; i < len; i++) 
+		bcmfb_putc(adp, off + i, s[i] & 0xff, (s[i] & 0xff00) >> 8);
+
+	return (0);
+}
+
+static int
+bcmfb_putm(video_adapter_t *adp, int x, int y, uint8_t *pixel_image,
+    uint32_t pixel_mask, int size, int width)
+{
+
+	return (0);
+}
+
+/*
+ * Define a stub keyboard driver in case one hasn't been
+ * compiled into the kernel
+ */
+#include <sys/kbio.h>
+#include <dev/kbd/kbdreg.h>
+
+static int dummy_kbd_configure(int flags);
+
+keyboard_switch_t bcmdummysw;
+
+static int
+dummy_kbd_configure(int flags)
+{
+
+	return (0);
+}
+KEYBOARD_DRIVER(bcmdummy, bcmdummysw, dummy_kbd_configure);

Added: head/sys/arm/broadcom/bcm2835/bcm2835_intr.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/arm/broadcom/bcm2835/bcm2835_intr.c	Thu Aug 30 20:59:37 2012	(r239922)
@@ -0,0 +1,203 @@
+/*-
+ * Copyright (c) 2012 Damjan Marion <dmarion@Freebsd.org>
+ * All rights reserved.
+ *
+ * Based on OMAP3 INTC code by Ben Gray
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
+ */
+
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/ktr.h>
+#include <sys/module.h>
+#include <sys/rman.h>
+#include <machine/bus.h>
+#include <machine/intr.h>
+
+#include <dev/fdt/fdt_common.h>
+#include <dev/ofw/openfirm.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#define	INTC_PENDING_BASIC	0x00
+#define	INTC_PENDING_BANK1	0x04
+#define	INTC_PENDING_BANK2	0x08
+#define	INTC_FIQ_CONTROL	0x0C
+#define	INTC_ENABLE_BANK1	0x10
+#define	INTC_ENABLE_BANK2	0x14
+#define	INTC_ENABLE_BASIC	0x18
+#define	INTC_DISABLE_BANK1	0x1C
+#define	INTC_DISABLE_BANK2	0x20
+#define	INTC_DISABLE_BASIC	0x24
+
+#define	BANK1_START	8
+#define	BANK1_END	(BANK1_START + 32 - 1)
+#define	BANK2_START	(BANK1_START + 32)
+#define	BANK2_END	(BANK2_START + 32 - 1)
+
+#define	IS_IRQ_BASIC(n)	(((n) >= 0) && ((n) < BANK1_START))
+#define	IS_IRQ_BANK1(n)	(((n) >= BANK1_START) && ((n) <= BANK1_END))
+#define	IS_IRQ_BANK2(n)	(((n) >= BANK2_START) && ((n) <= BANK2_END))
+#define	IRQ_BANK1(n)	((n) - BANK1_START)
+#define	IRQ_BANK2(n)	((n) - BANK2_START)
+
+#ifdef  DEBUG
+#define dprintf(fmt, args...) printf(fmt, ##args)
+#else
+#define dprintf(fmt, args...)
+#endif
+
+struct bcm_intc_softc {
+	device_t		sc_dev;
+	struct resource *	intc_res;
+	bus_space_tag_t		intc_bst;
+	bus_space_handle_t	intc_bsh;
+};
+
+static struct bcm_intc_softc *bcm_intc_sc = NULL;
+
+#define	intc_read_4(reg)		\
+    bus_space_read_4(bcm_intc_sc->intc_bst, bcm_intc_sc->intc_bsh, reg)
+#define	intc_write_4(reg, val)		\
+    bus_space_write_4(bcm_intc_sc->intc_bst, bcm_intc_sc->intc_bsh, reg, val)
+
+static int
+bcm_intc_probe(device_t dev)
+{
+	if (!ofw_bus_is_compatible(dev, "broadcom,bcm2835-armctrl-ic"))
+		return (ENXIO);
+	device_set_desc(dev, "BCM2835 Interrupt Controller");
+	return (BUS_PROBE_DEFAULT);
+}
+
+static int
+bcm_intc_attach(device_t dev)
+{
+	struct		bcm_intc_softc *sc = device_get_softc(dev);
+	int		rid = 0;
+
+	sc->sc_dev = dev;
+
+	if (bcm_intc_sc)
+		return (ENXIO);
+
+	sc->intc_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE);
+	if (sc->intc_res == NULL) {
+		device_printf(dev, "could not allocate memory resource\n");
+		return (ENXIO);
+	}
+
+	sc->intc_bst = rman_get_bustag(sc->intc_res);
+	sc->intc_bsh = rman_get_bushandle(sc->intc_res);
+
+	bcm_intc_sc = sc;
+
+	return (0);
+}
+
+static device_method_t bcm_intc_methods[] = {
+	DEVMETHOD(device_probe,		bcm_intc_probe),
+	DEVMETHOD(device_attach,	bcm_intc_attach),
+	{ 0, 0 }
+};
+
+static driver_t bcm_intc_driver = {
+	"intc",
+	bcm_intc_methods,
+	sizeof(struct bcm_intc_softc),
+};
+
+static devclass_t bcm_intc_devclass;
+
+DRIVER_MODULE(intc, simplebus, bcm_intc_driver, bcm_intc_devclass, 0, 0);
+
+int
+arm_get_next_irq(int last_irq)
+{
+	uint32_t pending;
+	int32_t irq = last_irq + 1;
+
+	/* Sanity check */
+	if (irq < 0)
+		irq = 0;
+	
+	/* TODO: should we mask last_irq? */
+	pending = intc_read_4(INTC_PENDING_BASIC);
+	while (irq < BANK1_START) {
+		if (pending & (1 << irq))
+			return irq;
+		irq++;
+	}
+
+	pending = intc_read_4(INTC_PENDING_BANK1);
+	while (irq < BANK2_START) {
+		if (pending & (1 << IRQ_BANK1(irq)))
+			return irq;
+		irq++;
+	}
+
+	pending = intc_read_4(INTC_PENDING_BANK2);
+	while (irq <= BANK2_END) {
+		if (pending & (1 << IRQ_BANK2(irq)))
+			return irq;
+		irq++;
+	}
+
+	return (-1);
+}
+
+void
+arm_mask_irq(uintptr_t nb)
+{
+	dprintf("%s: %d\n", __func__, nb);
+
+	if (IS_IRQ_BASIC(nb))
+		intc_write_4(INTC_DISABLE_BASIC, (1 << nb));
+	else if (IS_IRQ_BANK1(nb))
+		intc_write_4(INTC_DISABLE_BANK1, (1 << IRQ_BANK1(nb)));
+	else if (IS_IRQ_BANK2(nb))
+		intc_write_4(INTC_DISABLE_BANK2, (1 << IRQ_BANK2(nb)));
+	else
+		printf("arm_mask_irq: Invalid IRQ number: %d\n", nb);
+}
+
+void
+arm_unmask_irq(uintptr_t nb)
+{
+	dprintf("%s: %d\n", __func__, nb);
+
+	if (IS_IRQ_BASIC(nb))
+		intc_write_4(INTC_ENABLE_BASIC, (1 << nb));
+	else if (IS_IRQ_BANK1(nb))
+		intc_write_4(INTC_ENABLE_BANK1, (1 << IRQ_BANK1(nb)));
+	else if (IS_IRQ_BANK2(nb))
+		intc_write_4(INTC_ENABLE_BANK2, (1 << IRQ_BANK2(nb)));
+	else
+		printf("arm_mask_irq: Invalid IRQ number: %d\n", nb);
+}

Added: head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c	Thu Aug 30 20:59:37 2012	(r239922)
@@ -0,0 +1,603 @@
+/*-
+ * Copyright (c) 2012 Oleksandr Tymoshenko.
+ * Copyright (c) 1994-1998 Mark Brinicombe.
+ * Copyright (c) 1994 Brini.
+ * All rights reserved.
+ *
+ * This code is derived from software written for Brini by Mark Brinicombe
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by Brini.
+ * 4. The name of the company nor the name of the author may be used to
+ *    endorse or promote products derived from this software without specific
+ *    prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY BRINI ``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 BRINI OR CONTRIBUTORS 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.
+ *
+ * from: FreeBSD: //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c, rev 45
+ */
+
+#include "opt_ddb.h"
+#include "opt_platform.h"
+#include "opt_global.h"
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#define _ARM32_BUS_DMA_PRIVATE
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/sysproto.h>
+#include <sys/signalvar.h>
+#include <sys/imgact.h>
+#include <sys/kernel.h>
+#include <sys/ktr.h>
+#include <sys/linker.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/mutex.h>
+#include <sys/pcpu.h>
+#include <sys/proc.h>
+#include <sys/ptrace.h>
+#include <sys/cons.h>
+#include <sys/bio.h>
+#include <sys/bus.h>
+#include <sys/buf.h>
+#include <sys/exec.h>
+#include <sys/kdb.h>
+#include <sys/msgbuf.h>
+#include <machine/reg.h>
+#include <machine/cpu.h>
+#include <machine/fdt.h>
+
+#include <dev/fdt/fdt_common.h>
+#include <dev/ofw/openfirm.h>
+

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208302059.q7UKxbpT013259>