From owner-svn-src-head@freebsd.org Thu Nov 5 04:16:04 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DC082A2609C; Thu, 5 Nov 2015 04:16:04 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AE42D108E; Thu, 5 Nov 2015 04:16:04 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA54G301015788; Thu, 5 Nov 2015 04:16:03 GMT (envelope-from gonzo@FreeBSD.org) Received: (from gonzo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA54G3wI015786; Thu, 5 Nov 2015 04:16:03 GMT (envelope-from gonzo@FreeBSD.org) Message-Id: <201511050416.tA54G3wI015786@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gonzo set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko Date: Thu, 5 Nov 2015 04:16:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r290382 - head/sys/arm/broadcom/bcm2835 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Nov 2015 04:16:05 -0000 Author: gonzo Date: Thu Nov 5 04:16:03 2015 New Revision: 290382 URL: https://svnweb.freebsd.org/changeset/base/290382 Log: Add /dev/vcio, userland access point to VideoCore mailbox property channel It's required by some applications in raspberrypi-userland package Added: head/sys/arm/broadcom/bcm2835/bcm2835_vcio.c (contents, props changed) Modified: head/sys/arm/broadcom/bcm2835/files.bcm283x Added: head/sys/arm/broadcom/bcm2835/bcm2835_vcio.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/arm/broadcom/bcm2835/bcm2835_vcio.c Thu Nov 5 04:16:03 2015 (r290382) @@ -0,0 +1,122 @@ +/*- + * Copyright (c) 2015 Oleksandr Tymoshenko + * + * 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 +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +MALLOC_DECLARE(M_VCIO); +MALLOC_DEFINE(M_VCIO, "vcio", "VCIO temporary buffers"); + +static struct cdev *sdev; +static d_ioctl_t vcio_ioctl; + +static struct cdevsw vcio_devsw = { + /* version */ .d_version = D_VERSION, + /* ioctl */ .d_ioctl = vcio_ioctl, +}; + +#define VCIO_IOC_MAGIC 100 +#define IOCTL_MBOX_PROPERTY _IOWR(VCIO_IOC_MAGIC, 0, char *) + +int +vcio_ioctl(struct cdev *dev, u_long cmd, caddr_t arg, int mode, + struct thread *td) +{ + int error; + void *ptr; + uint32_t size; + uint8_t *property; + + error = 0; + switch(cmd) { + case IOCTL_MBOX_PROPERTY: + memcpy (&ptr, arg, sizeof(ptr)); + error = copyin(ptr, &size, sizeof(size)); + + if (error != 0) + break; + property = malloc(size, M_VCIO, M_WAITOK); + if (property == NULL) { + error = ENOMEM; + break; + } + + error = copyin(ptr, property, size); + if (error) { + free(property, M_VCIO); + break; + } + + error = bcm2835_mbox_property(property, size); + if (error) { + free(property, M_VCIO); + break; + } + + error = copyout(property, ptr, size); + free(property, M_VCIO); + + break; + default: + error = EINVAL; + break; + } + return (error); +} + +static int +vcio_load(module_t mod, int cmd, void *arg) +{ + int err = 0; + + switch (cmd) { + case MOD_LOAD: + sdev = make_dev(&vcio_devsw, 0, UID_ROOT, GID_WHEEL, 0600, "vcio"); + break; + + case MOD_UNLOAD: + destroy_dev(sdev); + break; + + default: + err = EOPNOTSUPP; + break; + } + + return(err); +} + +DEV_MODULE(vcio, vcio_load, NULL); +MODULE_DEPEND(vcio, mbox, 1, 1, 1); Modified: head/sys/arm/broadcom/bcm2835/files.bcm283x ============================================================================== --- head/sys/arm/broadcom/bcm2835/files.bcm283x Thu Nov 5 03:46:54 2015 (r290381) +++ head/sys/arm/broadcom/bcm2835/files.bcm283x Thu Nov 5 04:16:03 2015 (r290382) @@ -12,6 +12,7 @@ arm/broadcom/bcm2835/bcm2835_machdep.c arm/broadcom/bcm2835/bcm2835_mbox.c standard arm/broadcom/bcm2835/bcm2835_sdhci.c optional sdhci arm/broadcom/bcm2835/bcm2835_spi.c optional bcm2835_spi +arm/broadcom/bcm2835/bcm2835_vcio.c standard arm/broadcom/bcm2835/bcm2835_wdog.c standard arm/broadcom/bcm2835/bcm283x_dwc_fdt.c optional dwcotg fdt