Module Name: src
Committed By: macallan
Date: Wed Mar 23 04:06:04 UTC 2011
Modified Files:
src/sys/arch/shark/conf: files.shark
src/sys/arch/shark/ofw: ofw.c
src/sys/arch/shark/shark: consinit.c
Added Files:
src/sys/arch/shark/ofw: chipsfb_ofbus.c
Log Message:
add support for chipsfb at ofbus
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/shark/conf/files.shark
cvs rdiff -u -r0 -r1.1 src/sys/arch/shark/ofw/chipsfb_ofbus.c
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/shark/ofw/ofw.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/shark/shark/consinit.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/shark/conf/files.shark
diff -u src/sys/arch/shark/conf/files.shark:1.17 src/sys/arch/shark/conf/files.shark:1.18
--- src/sys/arch/shark/conf/files.shark:1.17 Wed Feb 20 21:43:35 2008
+++ src/sys/arch/shark/conf/files.shark Wed Mar 23 04:06:03 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.shark,v 1.17 2008/02/20 21:43:35 drochner Exp $
+# $NetBSD: files.shark,v 1.18 2011/03/23 04:06:03 macallan Exp $
#
# First try for arm-specific configuration info
#
@@ -126,6 +126,10 @@
attach igsfb at ofbus with igsfb_ofbus
file arch/shark/ofw/igsfb_ofbus.c igsfb_ofbus needs-flag
+# ofbus C&T 65550
+attach chipsfb at ofbus with chipsfb_ofbus
+file arch/shark/ofw/chipsfb_ofbus.c chipsfb_ofbus needs-flag
+
# Smart Card Reader
device scr: tty
file arch/shark/shark/scr.c scr needs-flag
Index: src/sys/arch/shark/ofw/ofw.c
diff -u src/sys/arch/shark/ofw/ofw.c:1.54 src/sys/arch/shark/ofw/ofw.c:1.55
--- src/sys/arch/shark/ofw/ofw.c:1.54 Fri Nov 12 13:40:10 2010
+++ src/sys/arch/shark/ofw/ofw.c Wed Mar 23 04:06:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw.c,v 1.54 2010/11/12 13:40:10 uebayasi Exp $ */
+/* $NetBSD: ofw.c,v 1.55 2011/03/23 04:06:03 macallan Exp $ */
/*
* Copyright 1997
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw.c,v 1.54 2010/11/12 13:40:10 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw.c,v 1.55 2011/03/23 04:06:03 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -78,6 +78,7 @@
#include "isadma.h"
#include "igsfb_ofbus.h"
+#include "chipsfb_ofbus.h"
#include "vga_ofbus.h"
#define IO_VIRT_BASE (OFW_VIRT_BASE + OFW_VIRT_SIZE)
@@ -145,7 +146,7 @@
int ofw_callbacks = 0; /* debugging counter */
-#if (NIGSFB_OFBUS > 0) || (NVGA_OFBUS > 0)
+#if (NIGSFB_OFBUS > 0) || (NCHIPSFB_OFBUS > 0) || (NVGA_OFBUS > 0)
int console_ihandle = 0;
static void reset_screen(void);
#endif
@@ -404,7 +405,7 @@
*ap++ = 0;
if (ap[-2] == '-')
*ap1 = 0;
-#if (NIGSFB_OFBUS > 0) || (NVGA_OFBUS > 0)
+#if (NIGSFB_OFBUS > 0) || (NCHIPSFB_OFBUS > 0) || (NVGA_OFBUS > 0)
reset_screen();
#endif
OF_boot(str);
@@ -413,7 +414,7 @@
ofw_exit:
printf("Calling OF_exit...\n");
-#if (NIGSFB_OFBUS > 0) || (NVGA_OFBUS > 0)
+#if (NIGSFB_OFBUS > 0) || (NCHIPSFB_OFBUS > 0) || (NVGA_OFBUS > 0)
reset_screen();
#endif
OF_exit();
@@ -1946,7 +1947,7 @@
}
-#if (NIGSFB_OFBUS > 0) || (NVGA_OFBUS > 0)
+#if (NIGSFB_OFBUS > 0) || (NCHIPSFB_OFBUS > 0) || (NVGA_OFBUS > 0)
static void
reset_screen(void)
{
Index: src/sys/arch/shark/shark/consinit.c
diff -u src/sys/arch/shark/shark/consinit.c:1.9 src/sys/arch/shark/shark/consinit.c:1.10
--- src/sys/arch/shark/shark/consinit.c:1.9 Wed Mar 18 10:22:36 2009
+++ src/sys/arch/shark/shark/consinit.c Wed Mar 23 04:06:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: consinit.c,v 1.9 2009/03/18 10:22:36 cegger Exp $ */
+/* $NetBSD: consinit.c,v 1.10 2011/03/23 04:06:03 macallan Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.9 2009/03/18 10:22:36 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.10 2011/03/23 04:06:03 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -71,8 +71,13 @@
#endif
#include "igsfb_ofbus.h"
+#include "chipsfb_ofbus.h"
#include <shark/ofw/igsfb_ofbusvar.h>
+#if (NCHIPSFB_OFBUS > 0)
+extern int chipsfb_ofbus_cnattach(bus_space_tag_t, bus_space_tag_t);
+#endif
+
#if (NCOM > 0)
#ifndef CONADDR
#define CONADDR 0x3f8
@@ -114,7 +119,7 @@
#endif
if (!comconsole) {
-#if (NVGA > 0) || (NIGSFB_OFBUS > 0)
+#if (NVGA > 0) || (NCHIPSFB_OFBUS > 0) || (NIGSFB_OFBUS > 0)
#if (NIGSFB_OFBUS > 0)
if (!igsfb_ofbus_cnattach(&isa_io_bs_tag, &isa_mem_bs_tag)) {
#if (NPCKBC > 0)
@@ -124,6 +129,15 @@
return;
}
#endif /* NIGSFB_OFBUS */
+#if (NCHIPSFB_OFBUS > 0)
+ if (!chipsfb_ofbus_cnattach(&isa_io_bs_tag, &isa_mem_bs_tag)) {
+#if (NPCKBC > 0)
+ pckbc_cnattach(&isa_io_bs_tag, IO_KBD, KBCMDP,
+ PCKBC_KBD_SLOT);
+#endif /* NPCKBC */
+ return;
+ }
+#endif /* NCHIPSFB_OFBUS */
#if (NVGA_OFBUS > 0)
if (!vga_ofbus_cnattach(&isa_io_bs_tag, &isa_mem_bs_tag)) {
#if (NPCKBC > 0)
@@ -133,6 +147,7 @@
return;
}
#endif /* NVGA_OFBUS */
+
#else /* NVGA */
#if (NOFCONS > 0)
cp = &ofcons;
Added files:
Index: src/sys/arch/shark/ofw/chipsfb_ofbus.c
diff -u /dev/null src/sys/arch/shark/ofw/chipsfb_ofbus.c:1.1
--- /dev/null Wed Mar 23 04:06:04 2011
+++ src/sys/arch/shark/ofw/chipsfb_ofbus.c Wed Mar 23 04:06:03 2011
@@ -0,0 +1,250 @@
+/* $NetBSD: chipsfb_ofbus.c,v 1.1 2011/03/23 04:06:03 macallan Exp $ */
+
+/*
+ * Copyright (c) 2006 Michael Lorenz
+ * 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 ``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.
+ */
+
+/*
+ * C&T 6555x series.
+ * ofbus attachment for chipsfb
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: chipsfb_ofbus.c,v 1.1 2011/03/23 04:06:03 macallan Exp $");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/device.h>
+#include <sys/malloc.h>
+#include <sys/buf.h>
+#include <uvm/uvm.h>
+
+#include <machine/bus.h>
+#include <machine/intr.h>
+#include <machine/ofw.h>
+#include <machine/pmap.h>
+
+#include <dev/isa/isavar.h>
+
+#include <dev/wscons/wsdisplayvar.h>
+#include <dev/wscons/wsconsio.h>
+#include <dev/rasops/rasops.h>
+#include <dev/wscons/wsdisplay_vconsvar.h>
+#include <dev/ofw/openfirm.h>
+
+#include <dev/ic/ct65550reg.h>
+#include <dev/ic/ct65550var.h>
+#include <shark/ofw/igsfb_ofbusvar.h>
+
+static int chipsfb_ofbus_is_console(int);
+
+static int chipsfb_ofbus_console = 0;
+static int chipsfb_ofbus_phandle = 0;
+
+
+
+static int chipsfb_ofbus_match(device_t, struct cfdata *, void *);
+static void chipsfb_ofbus_attach(device_t, device_t, void *);
+static paddr_t chipsfb_ofbus_mmap(void *, void *, off_t, int);
+int chipsfb_ofbus_cnattach(bus_space_tag_t, bus_space_tag_t);
+
+CFATTACH_DECL_NEW(chipsfb_ofbus, sizeof(struct chipsfb_softc),
+ chipsfb_ofbus_match, chipsfb_ofbus_attach, NULL, NULL);
+
+static const char const *compat_strings[] = { "CHPS,ct65550", NULL };
+
+vaddr_t chipsfb_mem_vaddr = 0, chipsfb_mmio_vaddr = 0;
+paddr_t chipsfb_mem_paddr;
+extern paddr_t isa_io_physaddr;
+struct bus_space chipsfb_memt, chipsfb_iot;
+
+#if (NCHIPSFB_OFBUS > 0) || (NVGA_OFBUS > 0)
+extern int console_ihandle;
+#endif
+
+int
+chipsfb_ofbus_cnattach(bus_space_tag_t iot, bus_space_tag_t memt)
+{
+ int chosen_phandle, ct_node;
+ int stdout_ihandle, stdout_phandle;
+ uint32_t regs[16];
+ //char mode_buffer[64];
+
+ stdout_phandle = 0;
+
+ /* first find out if there's a ct65550 at all in this machine */
+ ct_node = OF_finddevice("/vlbus/display");
+ if (ct_node == -1)
+ return ENXIO;
+ if (of_compatible(ct_node, compat_strings) < 0)
+ return ENXIO;
+
+ /*
+ * now we know there's a CyberPro in this machine so map it into
+ * kernel space, even if it's not the console
+ */
+ if (OF_getprop(ct_node, "reg", regs, sizeof(regs)) <= 0)
+ return ENXIO;
+
+ chipsfb_mem_paddr = be32toh(regs[10]);
+ /* 2MB RAM aperture, bufferable and cacheable */
+ chipsfb_mem_vaddr = ofw_map(chipsfb_mem_paddr, 0x00200000, L2_B | L2_C);
+ /* 128kB MMIO registers */
+ chipsfb_mmio_vaddr = ofw_map(chipsfb_mem_paddr + CT_OFF_BITBLT,
+ 0x00020000, 0);
+
+ memcpy(&chipsfb_memt, memt, sizeof(struct bus_space));
+ chipsfb_memt.bs_cookie = (void *)chipsfb_mem_vaddr;
+ memcpy(&chipsfb_iot, memt, sizeof(struct bus_space));
+ chipsfb_iot.bs_cookie = (void *)chipsfb_mmio_vaddr;
+
+ /*
+ * check if the firmware output device is indeed the ct65550
+ */
+ if ((chosen_phandle = OF_finddevice("/chosen")) == -1 ||
+ OF_getprop(chosen_phandle, "stdout", &stdout_ihandle,
+ sizeof(stdout_ihandle)) != sizeof(stdout_ihandle)) {
+ return ENXIO;
+ }
+ stdout_ihandle = of_decode_int((void *)&stdout_ihandle);
+ stdout_phandle = OF_instance_to_package(stdout_ihandle);
+
+ if (stdout_phandle != ct_node)
+ return ENXIO;
+
+
+ chipsfb_ofbus_console = 1;
+ chipsfb_ofbus_phandle = stdout_phandle;
+#if (NCHIPSFB_OFBUS > 0) || (NVGA_OFBUS > 0)
+ console_ihandle = stdout_ihandle;
+#endif
+ /* we're all set, now let's wait for chipsfb to attach */
+
+ return 0;
+}
+
+static int
+chipsfb_ofbus_is_console(int phandle)
+{
+
+ return chipsfb_ofbus_console && (phandle == chipsfb_ofbus_phandle);
+}
+
+
+static int
+chipsfb_ofbus_match(device_t parent, struct cfdata *match, void *aux)
+{
+ struct ofbus_attach_args *oba = aux;
+
+ if (of_compatible(oba->oba_phandle, compat_strings) < 0)
+ return 0;
+
+ return 10; /* beat vga etc. */
+}
+
+static void
+chipsfb_ofbus_attach(device_t parent, device_t self, void *aux)
+{
+ struct chipsfb_softc *sc = device_private(self);
+ struct ofbus_attach_args *oba = aux;
+ prop_dictionary_t dict;
+ int isconsole, width, height, linebytes, depth;
+
+ printf(": Chips & Technologies 65550 at 0x%08x\n",
+ (uint32_t)chipsfb_mem_paddr);
+
+ sc->sc_dev = self;
+ sc->sc_memt = &chipsfb_memt;
+ sc->sc_iot = &chipsfb_iot;
+ sc->sc_fb = chipsfb_mem_paddr;
+ sc->sc_fbsize = 0x00800000; /* 8MB aperture */
+ sc->sc_fbh = chipsfb_mem_vaddr;
+ sc->sc_mmregh = chipsfb_mmio_vaddr;
+ sc->sc_mmap = chipsfb_ofbus_mmap;
+ sc->sc_ioctl = NULL;
+ sc->memsize = 0x00200000;
+
+ dict = device_properties(sc->sc_dev);
+ if (OF_getprop(oba->oba_phandle, "width", &width, sizeof(width)) == 4) {
+ width = be32toh(width);
+ } else
+ width = 640;
+ if (OF_getprop(oba->oba_phandle, "height", &height, sizeof(height))
+ == 4) {
+ height = be32toh(height);
+ } else
+ height = 480;
+ if (OF_getprop(oba->oba_phandle, "depth", &depth, sizeof(depth)) == 4) {
+ depth = be32toh(depth);
+ } else
+ depth = 8;
+ if (OF_getprop(oba->oba_phandle, "linebytes", &linebytes,
+ sizeof(linebytes)) == 4) {
+ linebytes = be32toh(linebytes);
+ } else
+ linebytes = width * (depth >> 3);
+ isconsole = chipsfb_ofbus_is_console(oba->oba_phandle);
+
+ prop_dictionary_set_uint32(dict, "width", width);
+ prop_dictionary_set_uint32(dict, "height", height);
+ prop_dictionary_set_uint32(dict, "linebytes", linebytes);
+ prop_dictionary_set_uint32(dict, "depth", depth);
+ prop_dictionary_set_bool(dict, "is_console", isconsole);
+
+ if (bus_space_map(sc->sc_iot, 0, 0x400, 0, &sc->sc_ioregh) != 0) {
+ aprint_error("unable to map IO registers\n");
+ return;
+ }
+ chipsfb_do_attach(sc);
+}
+
+static paddr_t
+chipsfb_ofbus_mmap(void *v, void *vs, off_t offset, int prot)
+{
+
+#ifdef PCI_MAGIC_IO_RANGE
+ /* access to IO ports */
+ if ((offset >= PCI_MAGIC_IO_RANGE) &&
+ (offset < (PCI_MAGIC_IO_RANGE + 0x10000))) {
+ paddr_t pa;
+
+ pa = isa_io_physaddr + offset - PCI_MAGIC_IO_RANGE;
+ return arm_btop(pa);
+ }
+#endif
+
+ if ((offset >= chipsfb_mem_paddr) &&
+ (offset < (chipsfb_mem_paddr + CT_OFF_BITBLT))) {
+ return (arm_btop(offset) | ARM32_MMAP_WRITECOMBINE);
+ } else if ((offset >= (chipsfb_mem_paddr + CT_OFF_BITBLT)) &&
+ (offset < (chipsfb_mem_paddr + 0x00800000))) {
+ return arm_btop(offset);
+ } else if ((offset >= 0xa0000) &&
+ (offset < 0xbffff)) {
+ return (arm_btop(offset) | ARM32_MMAP_WRITECOMBINE);
+ }
+
+ return -1;
+}
