Author: gonzo
Date: Thu Dec 13 23:19:13 2012
New Revision: 244197
URL: http://svnweb.freebsd.org/changeset/base/244197

Log:
  Add support for QEMU's version of Versatile Platform Board

Added:
  head/sys/arm/conf/VERSATILEPB   (contents, props changed)
  head/sys/arm/versatile/
  head/sys/arm/versatile/bus_space.c   (contents, props changed)
  head/sys/arm/versatile/common.c   (contents, props changed)
  head/sys/arm/versatile/files.versatile   (contents, props changed)
  head/sys/arm/versatile/if_smc_fdt.c   (contents, props changed)
  head/sys/arm/versatile/pl050.c   (contents, props changed)
  head/sys/arm/versatile/sp804.c   (contents, props changed)
  head/sys/arm/versatile/versatile_clcd.c   (contents, props changed)
  head/sys/arm/versatile/versatile_machdep.c   (contents, props changed)
  head/sys/arm/versatile/versatile_pci.c   (contents, props changed)
  head/sys/arm/versatile/versatile_pci_bus_space.c   (contents, props changed)
  head/sys/arm/versatile/versatile_pci_bus_space.h   (contents, props changed)
  head/sys/arm/versatile/versatile_sic.c   (contents, props changed)
  head/sys/arm/versatile/versatile_timer.c   (contents, props changed)
  head/sys/boot/fdt/dts/versatilepb.dts   (contents, props changed)

Added: head/sys/arm/conf/VERSATILEPB
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/sys/arm/conf/VERSATILEPB       Thu Dec 13 23:19:13 2012        
(r244197)
@@ -0,0 +1,101 @@
+# RPI-B -- Custom configuration for the Raspberry Pi
+#
+# For more information on this file, please read the handbook section on
+# Kernel Configuration Files:
+#
+#    
http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#
+# The handbook is also available locally in /usr/share/doc/handbook
+# if you've installed the doc distribution, otherwise always see the
+# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
+# latest information.
+#
+# An exhaustive list of options and more detailed explanations of the
+# device lines is also present in the ../../conf/NOTES and NOTES files. 
+# If you are in doubt as to the purpose or necessity of a line, check first 
+# in NOTES.
+#
+# $FreeBSD$
+
+ident          VERSATILEPB
+machine                arm     armv6
+cpu            CPU_ARM11
+
+files          "../versatile/files.versatile"
+makeoptions    MODULES_OVERRIDE=""
+
+options        KERNVIRTADDR=0xc0100000
+makeoptions    KERNVIRTADDR=0xc0100000
+options        KERNPHYSADDR=0x00100000
+makeoptions    KERNPHYSADDR=0x00100000
+options        PHYSADDR=0x00000000
+options        STARTUP_PAGETABLE_ADDR=0x01000000
+options                FREEBSD_BOOT_LOADER
+options                LINUX_BOOT_ABI
+
+makeoptions    DEBUG=-g                #Build kernel with gdb(1) debug symbols
+options        HZ=100
+
+options        SCHED_4BSD              #4BSD scheduler
+options        INET                    #InterNETworking
+options        FFS                     #Berkeley Fast Filesystem
+options        SOFTUPDATES             #Enable FFS soft updates support
+options        UFS_ACL                 #Support for access control lists
+options        UFS_DIRHASH             #Improve performance on big directories
+device         snp
+
+options        PSEUDOFS                #Pseudo-filesystem framework
+options        COMPAT_43               #Compatible with BSD 4.3 [KEEP THIS!]
+options        SCSI_DELAY=5000         #Delay (in ms) before probing SCSI
+options        KTRACE                  #ktrace(1) support
+options        SYSVSHM                 #SYSV-style shared memory
+options        SYSVMSG                 #SYSV-style message queues
+options        SYSVSEM                 #SYSV-style semaphores
+options        _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
+options        KBD_INSTALL_CDEV        # install a CDEV entry in /dev
+options         ROOTDEVNAME=\"ufs:da0s2a\"
+
+options        PREEMPTION
+
+device         bpf
+device         loop
+device         mii
+device         mii_bitbang
+device         smc
+device         smcphy
+device         ether
+device         uart
+device         pl011
+device         pl190
+
+device         pty
+
+device         pci
+
+# SCSI Controllers
+device         sym             # NCR/Symbios/LSI Logic 53C8XX/53C1010/53C1510D
+
+# ATA/SCSI peripherals
+device         scbus           # SCSI bus (required for ATA/SCSI)
+device         da              # Direct Access (disks)
+device         pass            # Passthrough device (direct ATA/SCSI access)
+
+# NOTE: serial console is disabled if syscons enabled
+# Comment following lines for headless setup
+device         sc
+device         kbdmux
+options         SC_DFLT_FONT    # compile font in
+makeoptions     SC_DFLT_FONT=cp437
+
+options        KDB
+options        DDB                     #Enable the kernel debugger
+options        INVARIANTS              #Enable calls of extra sanity checking
+options        INVARIANT_SUPPORT       #Extra sanity checks of internal 
structures, required by INVARIANTS
+
+device         md
+device         random          # Entropy device
+
+# Flattened Device Tree
+options         FDT
+options         FDT_DTB_STATIC
+makeoptions     FDT_DTS_FILE=versatilepb.dts

Added: head/sys/arm/versatile/bus_space.c
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/sys/arm/versatile/bus_space.c  Thu Dec 13 23:19:13 2012        
(r244197)
@@ -0,0 +1,113 @@
+/*-
+ * Copyright (C) 2012 FreeBSD Foundation
+ * 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.
+ * 3. Neither the name of MARVELL nor the names of contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY 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 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/malloc.h>
+
+#include <machine/bus.h>
+
+/* Prototypes for all the bus_space structure functions */
+bs_protos(generic);
+bs_protos(generic_armv4);
+
+struct bus_space _base_tag = {
+       /* cookie */
+       .bs_cookie      = (void *) 0,
+       
+       /* mapping/unmapping */
+       .bs_map         = generic_bs_map,
+       .bs_unmap       = generic_bs_unmap,
+       .bs_subregion   = generic_bs_subregion,
+       
+       /* allocation/deallocation */
+       .bs_alloc       = generic_bs_alloc,
+       .bs_free        = generic_bs_free,
+       
+       /* barrier */
+       .bs_barrier     = generic_bs_barrier,
+       
+       /* read (single) */
+       .bs_r_1         = generic_bs_r_1,
+       .bs_r_2         = generic_armv4_bs_r_2,
+       .bs_r_4         = generic_bs_r_4,
+       .bs_r_8         = NULL,
+       
+       /* read multiple */
+       .bs_rm_1        = generic_bs_rm_1,
+       .bs_rm_2        = generic_armv4_bs_rm_2,
+       .bs_rm_4        = generic_bs_rm_4,
+       .bs_rm_8        = NULL,
+       
+       /* read region */
+       .bs_rr_1        = generic_bs_rr_1,
+       .bs_rr_2        = generic_armv4_bs_rr_2,
+       .bs_rr_4        = generic_bs_rr_4,
+       .bs_rr_8        = NULL,
+       
+       /* write (single) */
+       .bs_w_1         = generic_bs_w_1,
+       .bs_w_2         = generic_armv4_bs_w_2,
+       .bs_w_4         = generic_bs_w_4,
+       .bs_w_8         = NULL,
+       
+       /* write multiple */
+       .bs_wm_1        = generic_bs_wm_1,
+       .bs_wm_2        = generic_armv4_bs_wm_2,
+       .bs_wm_4        = generic_bs_wm_4,
+       .bs_wm_8        = NULL,
+       
+       /* write region */
+       .bs_wr_1        = generic_bs_wr_1,
+       .bs_wr_2        = generic_armv4_bs_wr_2,
+       .bs_wr_4        = generic_bs_wr_4,
+       .bs_wr_8        = NULL,
+       
+       /* set multiple */
+       /* XXX not implemented */
+       
+       /* set region */
+       .bs_sr_1        = NULL,
+       .bs_sr_2        = generic_armv4_bs_sr_2,
+       .bs_sr_4        = generic_bs_sr_4,
+       .bs_sr_8        = NULL,
+       
+       /* copy */
+       .bs_c_1         = NULL,
+       .bs_c_2         = generic_armv4_bs_c_2,
+       .bs_c_4         = NULL,
+       .bs_c_8         = NULL,
+};
+
+bus_space_tag_t fdtbus_bs_tag = &_base_tag;

Added: head/sys/arm/versatile/common.c
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/sys/arm/versatile/common.c     Thu Dec 13 23:19:13 2012        
(r244197)
@@ -0,0 +1,75 @@
+/*-
+ * Copyright (C) 2008-2011 MARVELL INTERNATIONAL LTD.
+ * All rights reserved.
+ *
+ * Developed by Semihalf.
+ *
+ * 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. Neither the name of MARVELL nor the names of contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY 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 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 "opt_global.h"
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/kdb.h>
+#include <sys/reboot.h>
+
+#include <dev/fdt/fdt_common.h>
+#include <dev/ofw/openfirm.h>
+
+#include <machine/bus.h>
+#include <machine/fdt.h>
+#include <machine/vmparam.h>
+
+struct fdt_fixup_entry fdt_fixup_table[] = {
+       { NULL, NULL }
+};
+
+static int
+fdt_intc_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,
+    int *pol)
+{
+
+       if (!fdt_is_compatible(node, "arm,versatile-vic"))
+               return (ENXIO);
+
+       *interrupt = fdt32_to_cpu(intr[0]);
+       *trig = INTR_TRIGGER_CONFORM;
+       *pol = INTR_POLARITY_CONFORM;
+
+       return (0);
+}
+
+
+fdt_pic_decode_t fdt_pic_table[] = {
+       &fdt_intc_decode_ic,
+       NULL
+};

Added: head/sys/arm/versatile/files.versatile
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/sys/arm/versatile/files.versatile      Thu Dec 13 23:19:13 2012        
(r244197)
@@ -0,0 +1,22 @@
+# $FreeBSD$
+
+arm/arm/bus_space_asm_generic.S                        standard
+arm/arm/bus_space_generic.c                     standard
+arm/arm/cpufunc_asm_arm11.S                     standard
+arm/arm/cpufunc_asm_armv5.S                     standard
+arm/arm/cpufunc_asm_armv6.S                     standard
+arm/arm/irq_dispatch.S                          standard
+
+arm/versatile/bus_space.c                      standard
+arm/versatile/common.c                         standard
+arm/versatile/pl050.c                          optional sc
+arm/versatile/sp804.c                          standard
+arm/versatile/versatile_machdep.c              standard
+arm/versatile/versatile_clcd.c                 optional sc
+arm/versatile/versatile_pci.c                  optional pci
+arm/versatile/versatile_pci_bus_space.c                optional pci
+arm/versatile/versatile_sic.c                  standard
+arm/versatile/versatile_timer.c                        standard
+arm/versatile/if_smc_fdt.c                     optional smc
+
+kern/kern_clocksource.c                         standard

Added: head/sys/arm/versatile/if_smc_fdt.c
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/sys/arm/versatile/if_smc_fdt.c Thu Dec 13 23:19:13 2012        
(r244197)
@@ -0,0 +1,131 @@
+/*-
+ * Copyright (c) 2008 Benno Rice
+ * 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.
+ *
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/kernel.h>
+#include <sys/socket.h>
+
+#include <sys/module.h>
+#include <sys/bus.h>
+
+#include <machine/bus.h>
+#include <machine/resource.h>
+
+#include <net/ethernet.h>
+#include <net/if.h>
+#include <net/if_arp.h>
+#include <net/if_media.h>
+
+#include <dev/smc/if_smcvar.h>
+
+#include <dev/mii/mii.h>
+#include <dev/mii/miivar.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>
+
+#include "miibus_if.h"
+
+static int             smc_fdt_probe(device_t);
+static int             smc_fdt_attach(device_t);
+static int             smc_fdt_detach(device_t);
+
+static int
+smc_fdt_probe(device_t dev)
+{
+       struct  smc_softc *sc;
+
+       if (ofw_bus_is_compatible(dev, "smsc,lan91c111")) {
+               sc = device_get_softc(dev);
+               sc->smc_usemem = 1;
+
+               if (smc_probe(dev) != 0) {
+                       return (ENXIO);
+               }
+
+               return (0);
+       }
+
+       return (ENXIO);
+}
+
+static int
+smc_fdt_attach(device_t dev)
+{
+       int     err;
+       struct  smc_softc *sc;
+
+       sc = device_get_softc(dev);
+
+       err = smc_attach(dev);
+       if (err) {
+               return (err);
+       }
+
+       return (0);
+}
+
+static int
+smc_fdt_detach(device_t dev)
+{
+
+       smc_detach(dev);
+
+       return (0);
+}
+
+static device_method_t smc_fdt_methods[] = {
+       /* Device interface */
+       DEVMETHOD(device_probe,         smc_fdt_probe),
+       DEVMETHOD(device_attach,        smc_fdt_attach),
+       DEVMETHOD(device_detach,        smc_fdt_detach),
+
+       /* MII interface */
+       DEVMETHOD(miibus_readreg,       smc_miibus_readreg),
+       DEVMETHOD(miibus_writereg,      smc_miibus_writereg),
+       DEVMETHOD(miibus_statchg,       smc_miibus_statchg),
+
+       { 0, 0 }
+};
+
+static driver_t smc_fdt_driver = {
+       "smc",
+       smc_fdt_methods,
+       sizeof(struct smc_softc),
+};
+
+extern devclass_t smc_devclass;
+
+DRIVER_MODULE(smc, simplebus, smc_fdt_driver, smc_devclass, 0, 0);
+DRIVER_MODULE(miibus, smc, miibus_driver, miibus_devclass, 0, 0);
+MODULE_DEPEND(smc, fdt, 1, 1, 1);
+MODULE_DEPEND(smc, ether, 1, 1, 1);
+MODULE_DEPEND(smc, miibus, 1, 1, 1);

Added: head/sys/arm/versatile/pl050.c
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/sys/arm/versatile/pl050.c      Thu Dec 13 23:19:13 2012        
(r244197)
@@ -0,0 +1,713 @@
+/*
+ * Copyright (c) 2012 Oleksandr Tymoshenko <go...@freebsd.org>
+ * All rights reserved.
+ *
+ * Based on dev/usb/input/ukbd.c  
+ *
+ * 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/module.h>
+#include <sys/malloc.h>
+#include <sys/rman.h>
+#include <sys/proc.h>
+#include <sys/sched.h>
+#include <sys/kdb.h>
+
+#include <machine/bus.h>
+#include <machine/cpu.h>
+#include <machine/frame.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>
+
+#include <sys/ioccom.h>
+#include <sys/filio.h>
+#include <sys/tty.h>
+#include <sys/kbio.h>
+
+#include <dev/kbd/kbdreg.h>
+
+#include <machine/bus.h>
+#include <machine/fdt.h>
+
+#include <dev/kbd/kbdtables.h>
+
+#define        KMI_LOCK()      mtx_lock(&Giant)
+#define        KMI_UNLOCK()    mtx_unlock(&Giant)
+
+#ifdef INVARIANTS
+/*
+ * Assert that the lock is held in all contexts
+ * where the code can be executed.
+ */
+#define        KMI_LOCK_ASSERT()       mtx_assert(&Giant, MA_OWNED)
+/*
+ * Assert that the lock is held in the contexts
+ * where it really has to be so.
+ */
+#define        KMI_CTX_LOCK_ASSERT()                           \
+       do {                                            \
+               if (!kdb_active && panicstr == NULL)    \
+                       mtx_assert(&Giant, MA_OWNED);   \
+       } while (0)
+#else
+#define KMI_LOCK_ASSERT()      (void)0
+#define KMI_CTX_LOCK_ASSERT()  (void)0
+#endif
+
+#define        KMICR           0x00
+#define                KMICR_TYPE_NONPS2       (1 << 5)
+#define                KMICR_RXINTREN          (1 << 4)
+#define                KMICR_TXINTREN          (1 << 3)
+#define                KMICR_EN                (1 << 2)
+#define                KMICR_FKMID             (1 << 1)
+#define                KMICR_FKMIC             (1 << 0)
+#define        KMISTAT         0x04
+#define                KMISTAT_TXEMPTY         (1 << 6)
+#define                KMISTAT_TXBUSY          (1 << 5)
+#define                KMISTAT_RXFULL          (1 << 4)
+#define                KMISTAT_RXBUSY          (1 << 3)
+#define                KMISTAT_RXPARITY        (1 << 2)
+#define                KMISTAT_KMIC            (1 << 1)
+#define                KMISTAT_KMID            (1 << 0)
+#define        KMIDATA         0x08
+#define        KMICLKDIV       0x0C
+#define        KMIIR           0x10
+#define                KMIIR_TXINTR            (1 << 1)
+#define                KMIIR_RXINTR            (1 << 0)
+
+#define        KMI_DRIVER_NAME          "kmi"
+#define        KMI_NFKEY        (sizeof(fkey_tab)/sizeof(fkey_tab[0])) /* 
units */
+
+struct kmi_softc {
+       keyboard_t sc_kbd;
+       keymap_t sc_keymap;
+       accentmap_t sc_accmap;
+       fkeytab_t sc_fkeymap[KMI_NFKEY];
+
+       struct resource*        sc_mem_res;
+       struct resource*        sc_irq_res;
+       void*                   sc_intr_hl;
+
+       int                     sc_mode;                /* input mode 
(K_XLATE,K_RAW,K_CODE) */
+       int                     sc_state;               /* shift/lock key state 
*/
+       int                     sc_accents;             /* accent key index (> 
0) */
+       uint32_t                sc_flags;               /* flags */
+#define        KMI_FLAG_COMPOSE        0x00000001
+#define        KMI_FLAG_POLLING        0x00000002
+
+       struct                  thread *sc_poll_thread;
+};
+
+/* Read/Write macros for Timer used as timecounter */
+#define pl050_kmi_read_4(sc, reg)              \
+       bus_read_4((sc)->sc_mem_res, (reg))
+
+#define pl050_kmi_write_4(sc, reg, val)        \
+       bus_write_4((sc)->sc_mem_res, (reg), (val))
+
+/* prototypes */
+static void    kmi_set_leds(struct kmi_softc *, uint8_t);
+static int     kmi_set_typematic(keyboard_t *, int);
+static uint32_t        kmi_read_char(keyboard_t *, int);
+static void    kmi_clear_state(keyboard_t *);
+static int     kmi_ioctl(keyboard_t *, u_long, caddr_t);
+static int     kmi_enable(keyboard_t *);
+static int     kmi_disable(keyboard_t *);
+
+/* early keyboard probe, not supported */
+static int
+kmi_configure(int flags)
+{
+       return (0);
+}
+
+/* detect a keyboard, not used */
+static int
+kmi_probe(int unit, void *arg, int flags)
+{
+       return (ENXIO);
+}
+
+/* reset and initialize the device, not used */
+static int
+kmi_init(int unit, keyboard_t **kbdp, void *arg, int flags)
+{
+       return (ENXIO);
+}
+
+/* test the interface to the device, not used */
+static int
+kmi_test_if(keyboard_t *kbd)
+{
+       return (0);
+}
+
+/* finish using this keyboard, not used */
+static int
+kmi_term(keyboard_t *kbd)
+{
+       return (ENXIO);
+}
+
+/* keyboard interrupt routine, not used */
+static int
+kmi_intr(keyboard_t *kbd, void *arg)
+{
+
+       return (0);
+}
+
+/* lock the access to the keyboard, not used */
+static int
+kmi_lock(keyboard_t *kbd, int lock)
+{
+       return (1);
+}
+
+/*
+ * Enable the access to the device; until this function is called,
+ * the client cannot read from the keyboard.
+ */
+static int
+kmi_enable(keyboard_t *kbd)
+{
+
+       KMI_LOCK();
+       KBD_ACTIVATE(kbd);
+       KMI_UNLOCK();
+
+       return (0);
+}
+
+/* disallow the access to the device */
+static int
+kmi_disable(keyboard_t *kbd)
+{
+
+       KMI_LOCK();
+       KBD_DEACTIVATE(kbd);
+       KMI_UNLOCK();
+
+       return (0);
+}
+
+/* check if data is waiting */
+static int
+kmi_check(keyboard_t *kbd)
+{
+       struct kmi_softc *sc = kbd->kb_data;
+       uint32_t reg;
+
+       KMI_CTX_LOCK_ASSERT();
+
+       if (!KBD_IS_ACTIVE(kbd))
+               return (0);
+
+       reg = pl050_kmi_read_4(sc, KMIIR);
+       return (reg & KMIIR_RXINTR);
+}
+
+/* check if char is waiting */
+static int
+kmi_check_char_locked(keyboard_t *kbd)
+{
+       KMI_CTX_LOCK_ASSERT();
+
+       if (!KBD_IS_ACTIVE(kbd))
+               return (0);
+
+       return (kmi_check(kbd));
+}
+
+static int
+kmi_check_char(keyboard_t *kbd)
+{
+       int result;
+
+       KMI_LOCK();
+       result = kmi_check_char_locked(kbd);
+       KMI_UNLOCK();
+
+       return (result);
+}
+
+/* read one byte from the keyboard if it's allowed */
+/* Currently unused. */
+static int
+kmi_read(keyboard_t *kbd, int wait)
+{
+       KMI_CTX_LOCK_ASSERT();
+
+       if (!KBD_IS_ACTIVE(kbd))
+               return (-1);
+
+       ++(kbd->kb_count);
+       printf("Implement ME: %s\n", __func__);
+       return (0);
+}
+
+/* read char from the keyboard */
+static uint32_t
+kmi_read_char_locked(keyboard_t *kbd, int wait)
+{
+       struct kmi_softc *sc = kbd->kb_data;
+       uint32_t reg, data;
+
+       KMI_CTX_LOCK_ASSERT();
+
+       if (!KBD_IS_ACTIVE(kbd))
+               return (NOKEY);
+
+       reg = pl050_kmi_read_4(sc, KMIIR);
+       if (reg & KMIIR_RXINTR) {
+               data = pl050_kmi_read_4(sc, KMIDATA);
+               return (data);
+       }
+
+       ++kbd->kb_count;
+       return (NOKEY);
+}
+
+/* Currently wait is always false. */
+static uint32_t
+kmi_read_char(keyboard_t *kbd, int wait)
+{
+       uint32_t keycode;
+
+       KMI_LOCK();
+       keycode = kmi_read_char_locked(kbd, wait);
+       KMI_UNLOCK();
+
+       return (keycode);
+}
+
+/* some useful control functions */
+static int
+kmi_ioctl_locked(keyboard_t *kbd, u_long cmd, caddr_t arg)
+{
+       struct kmi_softc *sc = kbd->kb_data;
+       int i;
+#if defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD5) || \
+    defined(COMPAT_FREEBSD4) || defined(COMPAT_43)
+       int ival;
+
+#endif
+
+       KMI_LOCK_ASSERT();
+
+       switch (cmd) {
+       case KDGKBMODE:         /* get keyboard mode */
+               *(int *)arg = sc->sc_mode;
+               break;
+#if defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD5) || \
+    defined(COMPAT_FREEBSD4) || defined(COMPAT_43)
+       case _IO('K', 7):
+               ival = IOCPARM_IVAL(arg);
+               arg = (caddr_t)&ival;
+               /* FALLTHROUGH */
+#endif
+       case KDSKBMODE:         /* set keyboard mode */
+               switch (*(int *)arg) {
+               case K_XLATE:
+                       if (sc->sc_mode != K_XLATE) {
+                               /* make lock key state and LED state match */
+                               sc->sc_state &= ~LOCK_MASK;
+                               sc->sc_state |= KBD_LED_VAL(kbd);
+                       }
+                       /* FALLTHROUGH */
+               case K_RAW:
+               case K_CODE:
+                       if (sc->sc_mode != *(int *)arg) {
+                               if ((sc->sc_flags & KMI_FLAG_POLLING) == 0)
+                                       kmi_clear_state(kbd);
+                               sc->sc_mode = *(int *)arg;
+                       }
+                       break;
+               default:
+                       return (EINVAL);
+               }
+               break;
+
+       case KDGETLED:                  /* get keyboard LED */
+               *(int *)arg = KBD_LED_VAL(kbd);
+               break;
+#if defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD5) || \
+    defined(COMPAT_FREEBSD4) || defined(COMPAT_43)
+       case _IO('K', 66):
+               ival = IOCPARM_IVAL(arg);
+               arg = (caddr_t)&ival;
+               /* FALLTHROUGH */
+#endif
+       case KDSETLED:                  /* set keyboard LED */
+               /* NOTE: lock key state in "sc_state" won't be changed */
+               if (*(int *)arg & ~LOCK_MASK)
+                       return (EINVAL);
+
+               i = *(int *)arg;
+
+               /* replace CAPS LED with ALTGR LED for ALTGR keyboards */
+               if (sc->sc_mode == K_XLATE &&
+                   kbd->kb_keymap->n_keys > ALTGR_OFFSET) {
+                       if (i & ALKED)
+                               i |= CLKED;
+                       else
+                               i &= ~CLKED;
+               }
+               if (KBD_HAS_DEVICE(kbd))
+                       kmi_set_leds(sc, i);
+
+               KBD_LED_VAL(kbd) = *(int *)arg;
+               break;
+       case KDGKBSTATE:                /* get lock key state */
+               *(int *)arg = sc->sc_state & LOCK_MASK;
+               break;
+#if defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD5) || \
+    defined(COMPAT_FREEBSD4) || defined(COMPAT_43)
+       case _IO('K', 20):
+               ival = IOCPARM_IVAL(arg);
+               arg = (caddr_t)&ival;
+               /* FALLTHROUGH */
+#endif
+       case KDSKBSTATE:                /* set lock key state */
+               if (*(int *)arg & ~LOCK_MASK) {
+                       return (EINVAL);
+               }
+               sc->sc_state &= ~LOCK_MASK;
+               sc->sc_state |= *(int *)arg;
+
+               /* set LEDs and quit */
+               return (kmi_ioctl(kbd, KDSETLED, arg));
+
+       case KDSETREPEAT:               /* set keyboard repeat rate (new
+                                        * interface) */
+               if (!KBD_HAS_DEVICE(kbd)) {
+                       return (0);
+               }
+               if (((int *)arg)[1] < 0) {
+                       return (EINVAL);
+               }
+               if (((int *)arg)[0] < 0) {
+                       return (EINVAL);
+               }
+               if (((int *)arg)[0] < 200)      /* fastest possible value */
+                       kbd->kb_delay1 = 200;
+               else
+                       kbd->kb_delay1 = ((int *)arg)[0];
+               kbd->kb_delay2 = ((int *)arg)[1];
+               return (0);
+
+#if defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD5) || \
+    defined(COMPAT_FREEBSD4) || defined(COMPAT_43)
+       case _IO('K', 67):
+               ival = IOCPARM_IVAL(arg);
+               arg = (caddr_t)&ival;
+               /* FALLTHROUGH */
+#endif
+       case KDSETRAD:                  /* set keyboard repeat rate (old
+                                        * interface) */
+               return (kmi_set_typematic(kbd, *(int *)arg));
+
+       case PIO_KEYMAP:                /* set keyboard translation table */
+       case OPIO_KEYMAP:               /* set keyboard translation table
+                                        * (compat) */
+       case PIO_KEYMAPENT:             /* set keyboard translation table
+                                        * entry */
+       case PIO_DEADKEYMAP:            /* set accent key translation table */
+               sc->sc_accents = 0;
+               /* FALLTHROUGH */
+       default:
+               return (genkbd_commonioctl(kbd, cmd, arg));
+       }
+
+       return (0);
+}
+
+static int
+kmi_ioctl(keyboard_t *kbd, u_long cmd, caddr_t arg)
+{
+       int result;
+
+       /*
+        * XXX KDGKBSTATE, KDSKBSTATE and KDSETLED can be called from any
+        * context where printf(9) can be called, which among other things
+        * includes interrupt filters and threads with any kinds of locks
+        * already held.  For this reason it would be dangerous to acquire
+        * the Giant here unconditionally.  On the other hand we have to
+        * have it to handle the ioctl.
+        * So we make our best effort to auto-detect whether we can grab
+        * the Giant or not.  Blame syscons(4) for this.
+        */
+       switch (cmd) {
+       case KDGKBSTATE:
+       case KDSKBSTATE:
+       case KDSETLED:
+               if (!mtx_owned(&Giant) && !SCHEDULER_STOPPED())
+                       return (EDEADLK);       /* best I could come up with */
+               /* FALLTHROUGH */
+       default:
+               KMI_LOCK();
+               result = kmi_ioctl_locked(kbd, cmd, arg);
+               KMI_UNLOCK();
+               return (result);
+       }
+}
+
+
+/* clear the internal state of the keyboard */
+static void
+kmi_clear_state(keyboard_t *kbd)
+{
+       struct kmi_softc *sc = kbd->kb_data;
+
+       KMI_CTX_LOCK_ASSERT();
+
+       sc->sc_flags &= ~(KMI_FLAG_COMPOSE | KMI_FLAG_POLLING);
+       sc->sc_state &= LOCK_MASK;      /* preserve locking key state */
+       sc->sc_accents = 0;
+}
+
+/* save the internal state, not used */
+static int
+kmi_get_state(keyboard_t *kbd, void *buf, size_t len)
+{
+       return (len == 0) ? 1 : -1;
+}
+
+/* set the internal state, not used */
+static int
+kmi_set_state(keyboard_t *kbd, void *buf, size_t len)
+{
+       return (EINVAL);
+}
+
+static int
+kmi_poll(keyboard_t *kbd, int on)
+{
+       struct kmi_softc *sc = kbd->kb_data;
+
+       KMI_LOCK();
+       if (on) {
+               sc->sc_flags |= KMI_FLAG_POLLING;
+               sc->sc_poll_thread = curthread;
+       } else {
+               sc->sc_flags &= ~KMI_FLAG_POLLING;
+       }
+       KMI_UNLOCK();
+
+       return (0);
+}
+
+/* local functions */
+
+static void
+kmi_set_leds(struct kmi_softc *sc, uint8_t leds)
+{
+
+       KMI_LOCK_ASSERT();
+
+       /* start transfer, if not already started */
+       printf("Implement me: %s\n", __func__);

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to