Index: head/sys/arm/broadcom/bcm2835/bcm2835_vcio.c =================================================================== --- head/sys/arm/broadcom/bcm2835/bcm2835_vcio.c (revision 303878) +++ head/sys/arm/broadcom/bcm2835/bcm2835_vcio.c (revision 303879) @@ -1,122 +1,118 @@ /*- * 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); Index: head/sys/arm/xscale/pxa/pxa_smi.c =================================================================== --- head/sys/arm/xscale/pxa/pxa_smi.c (revision 303878) +++ head/sys/arm/xscale/pxa/pxa_smi.c (revision 303879) @@ -1,356 +1,354 @@ /*- * Copyright (c) 2006 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 __FBSDID("$FreeBSD$"); #include #include #include #include #include #include #include #include #include #include #include #include #include #include static MALLOC_DEFINE(M_PXASMI, "PXA SMI", "Data for static memory interface devices."); struct pxa_smi_softc { struct resource *ps_res[1]; struct rman ps_mem; bus_space_tag_t ps_bst; bus_addr_t ps_base; }; struct smi_ivars { struct resource_list smid_resources; bus_addr_t smid_mem; }; static struct resource_spec pxa_smi_spec[] = { { SYS_RES_MEMORY, 0, RF_ACTIVE }, { -1, 0 } }; static int pxa_smi_probe(device_t); static int pxa_smi_attach(device_t); static int pxa_smi_print_child(device_t, device_t); static int pxa_smi_read_ivar(device_t, device_t, int, uintptr_t *); static struct resource * pxa_smi_alloc_resource(device_t, device_t, int, int *, rman_res_t, rman_res_t, rman_res_t, u_int); static int pxa_smi_release_resource(device_t, device_t, int, int, struct resource *); static int pxa_smi_activate_resource(device_t, device_t, int, int, struct resource *); static void pxa_smi_add_device(device_t, const char *, int); static int pxa_smi_probe(device_t dev) { if (resource_disabled("smi", device_get_unit(dev))) return (ENXIO); device_set_desc(dev, "Static Memory Interface"); return (0); } static int pxa_smi_attach(device_t dev) { int error, i, dunit; const char *dname; struct pxa_smi_softc *sc; sc = (struct pxa_smi_softc *)device_get_softc(dev); error = bus_alloc_resources(dev, pxa_smi_spec, sc->ps_res); if (error) { device_printf(dev, "could not allocate resources\n"); return (ENXIO); } sc->ps_mem.rm_type = RMAN_ARRAY; sc->ps_mem.rm_descr = device_get_nameunit(dev); if (rman_init(&sc->ps_mem) != 0) panic("pxa_smi_attach: failed to init mem rman"); if (rman_manage_region(&sc->ps_mem, 0, PXA2X0_CS_SIZE * 6) != 0) panic("pxa_smi_attach: failed ot set up mem rman"); sc->ps_bst = base_tag; sc->ps_base = rman_get_start(sc->ps_res[0]); i = 0; while (resource_find_match(&i, &dname, &dunit, "at", device_get_nameunit(dev)) == 0) { pxa_smi_add_device(dev, dname, dunit); } bus_generic_probe(dev); bus_generic_attach(dev); return (0); } static int pxa_smi_print_child(device_t dev, device_t child) { struct smi_ivars *smid; int retval; smid = (struct smi_ivars *)device_get_ivars(child); if (smid == NULL) { device_printf(dev, "unknown device: %s\n", device_get_nameunit(child)); return (0); } retval = 0; retval += bus_print_child_header(dev, child); retval += resource_list_print_type(&smid->smid_resources, "at mem", SYS_RES_MEMORY, "%#jx"); retval += resource_list_print_type(&smid->smid_resources, "irq", SYS_RES_IRQ, "%jd"); retval += bus_print_child_footer(dev, child); return (retval); } static int pxa_smi_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) { struct pxa_smi_softc *sc; struct smi_ivars *smid; sc = device_get_softc(dev); smid = device_get_ivars(child); switch (which) { case SMI_IVAR_PHYSBASE: *((bus_addr_t *)result) = smid->smid_mem; break; default: return (ENOENT); } return (0); } static struct resource * pxa_smi_alloc_resource(device_t dev, device_t child, int type, int *rid, rman_res_t start, rman_res_t end, rman_res_t count, u_int flags) { struct pxa_smi_softc *sc; struct smi_ivars *smid; struct resource *rv; struct resource_list *rl; struct resource_list_entry *rle; int needactivate; sc = (struct pxa_smi_softc *)device_get_softc(dev); smid = (struct smi_ivars *)device_get_ivars(child); rl = &smid->smid_resources; if (type == SYS_RES_IOPORT) type = SYS_RES_MEMORY; rle = resource_list_find(rl, type, *rid); if (rle == NULL) return (NULL); if (rle->res != NULL) panic("pxa_smi_alloc_resource: resource is busy"); needactivate = flags & RF_ACTIVE; flags &= ~RF_ACTIVE; switch (type) { case SYS_RES_MEMORY: rv = rman_reserve_resource(&sc->ps_mem, rle->start, rle->end, rle->count, flags, child); if (rv == NULL) return (NULL); rle->res = rv; rman_set_rid(rv, *rid); rman_set_bustag(rv, sc->ps_bst); rman_set_bushandle(rv, rle->start); if (needactivate) { if (bus_activate_resource(child, type, *rid, rv) != 0) { rman_release_resource(rv); return (NULL); } } break; case SYS_RES_IRQ: rv = bus_alloc_resource(dev, type, rid, rle->start, rle->end, rle->count, flags); if (rv == NULL) return (NULL); if (needactivate) { if (bus_activate_resource(child, type, *rid, rv) != 0) { bus_release_resource(dev, type, *rid, rv); return (NULL); } } break; default: return (NULL); } return (rv); } static int pxa_smi_release_resource(device_t dev, device_t child, int type, int rid, struct resource *r) { struct smi_ivars *smid; struct resource_list *rl; struct resource_list_entry *rle; if (type == SYS_RES_IRQ) return (bus_release_resource(dev, SYS_RES_IRQ, rid, r)); smid = (struct smi_ivars *)device_get_ivars(child); rl = &smid->smid_resources; if (type == SYS_RES_IOPORT) type = SYS_RES_MEMORY; rle = resource_list_find(rl, type, rid); if (rle == NULL) panic("pxa_smi_release_resource: can't find resource"); if (rle->res == NULL) panic("pxa_smi_release_resource: resource entry not busy"); rman_release_resource(rle->res); rle->res = NULL; return (0); } static int pxa_smi_activate_resource(device_t dev, device_t child, int type, int rid, struct resource *r) { struct pxa_smi_softc *sc; sc = (struct pxa_smi_softc *)device_get_softc(dev); if (type == SYS_RES_IRQ) return (bus_activate_resource(dev, SYS_RES_IRQ, rid, r)); rman_set_bushandle(r, (bus_space_handle_t)pmap_mapdev(rman_get_start(r), rman_get_size(r))); return (rman_activate_resource(r)); } static device_method_t pxa_smi_methods[] = { DEVMETHOD(device_probe, pxa_smi_probe), DEVMETHOD(device_attach, pxa_smi_attach), DEVMETHOD(bus_print_child, pxa_smi_print_child), DEVMETHOD(bus_read_ivar, pxa_smi_read_ivar), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_alloc_resource, pxa_smi_alloc_resource), DEVMETHOD(bus_release_resource, pxa_smi_release_resource), DEVMETHOD(bus_activate_resource, pxa_smi_activate_resource), {0, 0} }; static driver_t pxa_smi_driver = { "smi", pxa_smi_methods, sizeof(struct pxa_smi_softc), }; static devclass_t pxa_smi_devclass; DRIVER_MODULE(smi, pxa, pxa_smi_driver, pxa_smi_devclass, 0, 0); static void pxa_smi_add_device(device_t dev, const char *name, int unit) { device_t child; int start, count; struct smi_ivars *ivars; ivars = (struct smi_ivars *)malloc( sizeof(struct smi_ivars), M_PXASMI, M_WAITOK); - if (ivars == NULL) - return; child = device_add_child(dev, name, unit); if (child == NULL) { free(ivars, M_PXASMI); return; } device_set_ivars(child, ivars); resource_list_init(&ivars->smid_resources); start = 0; count = 0; resource_int_value(name, unit, "mem", &start); resource_int_value(name, unit, "size", &count); if (start > 0 || count > 0) { resource_list_add(&ivars->smid_resources, SYS_RES_MEMORY, 0, start, start + count, count); ivars->smid_mem = (bus_addr_t)start; } start = -1; count = 0; resource_int_value(name, unit, "irq", &start); if (start > -1) resource_list_add(&ivars->smid_resources, SYS_RES_IRQ, 0, start, start, 1); if (resource_disabled(name, unit)) device_disable(child); } Index: head/sys/arm/xscale/pxa/pxa_space.c =================================================================== --- head/sys/arm/xscale/pxa/pxa_space.c (revision 303878) +++ head/sys/arm/xscale/pxa/pxa_space.c (revision 303879) @@ -1,268 +1,265 @@ /* $NetBSD: obio_space.c,v 1.6 2003/07/15 00:25:05 lukem Exp $ */ /*- * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. * All rights reserved. * * Written by Jason R. Thorpe for Wasabi Systems, Inc. * * 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 for the NetBSD Project by * Wasabi Systems, Inc. * 4. The name of Wasabi Systems, Inc. may not be used to endorse * or promote products derived from this software without specific prior * written permission. * * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``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 WASABI SYSTEMS, INC * 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. */ /* * bus_space functions for PXA devices */ #include __FBSDID("$FreeBSD$"); #include #include #include #include #include #include #include #include static MALLOC_DEFINE(M_PXATAG, "PXA bus_space tags", "Bus_space tags for PXA"); /* Prototypes for all the bus_space structure functions */ bs_protos(generic); bs_protos(pxa); /* * The obio bus space tag. This is constant for all instances, so * we never have to explicitly "create" it. */ struct bus_space _base_tag = { /* cookie */ .bs_privdata = NULL, /* 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 = pxa_bs_r_1, .bs_r_2 = pxa_bs_r_2, .bs_r_4 = pxa_bs_r_4, .bs_r_8 = BS_UNIMPLEMENTED, /* read multiple */ .bs_rm_1 = pxa_bs_rm_1, .bs_rm_2 = pxa_bs_rm_2, .bs_rm_4 = BS_UNIMPLEMENTED, .bs_rm_8 = BS_UNIMPLEMENTED, /* read region */ .bs_rr_1 = pxa_bs_rr_1, .bs_rr_2 = BS_UNIMPLEMENTED, .bs_rr_4 = BS_UNIMPLEMENTED, .bs_rr_8 = BS_UNIMPLEMENTED, /* write (single) */ .bs_w_1 = pxa_bs_w_1, .bs_w_2 = pxa_bs_w_2, .bs_w_4 = pxa_bs_w_4, .bs_w_8 = BS_UNIMPLEMENTED, /* write multiple */ .bs_wm_1 = pxa_bs_wm_1, .bs_wm_2 = pxa_bs_wm_2, .bs_wm_4 = BS_UNIMPLEMENTED, .bs_wm_8 = BS_UNIMPLEMENTED, /* write region */ .bs_wr_1 = BS_UNIMPLEMENTED, .bs_wr_2 = BS_UNIMPLEMENTED, .bs_wr_4 = BS_UNIMPLEMENTED, .bs_wr_8 = BS_UNIMPLEMENTED, /* set multiple */ .bs_sm_1 = BS_UNIMPLEMENTED, .bs_sm_2 = BS_UNIMPLEMENTED, .bs_sm_4 = BS_UNIMPLEMENTED, .bs_sm_8 = BS_UNIMPLEMENTED, /* set region */ .bs_sr_1 = BS_UNIMPLEMENTED, .bs_sr_2 = BS_UNIMPLEMENTED, .bs_sr_4 = BS_UNIMPLEMENTED, .bs_sr_8 = BS_UNIMPLEMENTED, /* copy */ .bs_c_1 = BS_UNIMPLEMENTED, .bs_c_2 = BS_UNIMPLEMENTED, .bs_c_4 = BS_UNIMPLEMENTED, .bs_c_8 = BS_UNIMPLEMENTED, /* read stream (single) */ .bs_r_1_s = BS_UNIMPLEMENTED, .bs_r_2_s = BS_UNIMPLEMENTED, .bs_r_4_s = BS_UNIMPLEMENTED, .bs_r_8_s = BS_UNIMPLEMENTED, /* read multiple stream */ .bs_rm_1_s = BS_UNIMPLEMENTED, .bs_rm_2_s = BS_UNIMPLEMENTED, .bs_rm_4_s = BS_UNIMPLEMENTED, .bs_rm_8_s = BS_UNIMPLEMENTED, /* read region stream */ .bs_rr_1_s = BS_UNIMPLEMENTED, .bs_rr_2_s = BS_UNIMPLEMENTED, .bs_rr_4_s = BS_UNIMPLEMENTED, .bs_rr_8_s = BS_UNIMPLEMENTED, /* write stream (single) */ .bs_w_1_s = BS_UNIMPLEMENTED, .bs_w_2_s = BS_UNIMPLEMENTED, .bs_w_4_s = BS_UNIMPLEMENTED, .bs_w_8_s = BS_UNIMPLEMENTED, /* write multiple stream */ .bs_wm_1_s = BS_UNIMPLEMENTED, .bs_wm_2_s = BS_UNIMPLEMENTED, .bs_wm_4_s = BS_UNIMPLEMENTED, .bs_wm_8_s = BS_UNIMPLEMENTED, /* write region stream */ .bs_wr_1_s = BS_UNIMPLEMENTED, .bs_wr_2_s = BS_UNIMPLEMENTED, .bs_wr_4_s = BS_UNIMPLEMENTED, .bs_wr_8_s = BS_UNIMPLEMENTED, }; static struct bus_space _obio_tag; bus_space_tag_t base_tag = &_base_tag; bus_space_tag_t obio_tag = NULL; void pxa_obio_tag_init() { bcopy(&_base_tag, &_obio_tag, sizeof(struct bus_space)); _obio_tag.bs_privdata = (void *)PXA2X0_PERIPH_OFFSET; obio_tag = &_obio_tag; } bus_space_tag_t pxa_bus_tag_alloc(bus_addr_t offset) { struct bus_space *tag; tag = (struct bus_space *)malloc(sizeof(struct bus_space), M_PXATAG, M_WAITOK); - if (tag == NULL) { - return (NULL); - } bcopy(&_base_tag, tag, sizeof(struct bus_space)); tag->bs_privdata = (void *)offset; return ((bus_space_tag_t)tag); } #define READ_SINGLE(type, proto, base) \ type \ proto(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset) \ { \ bus_addr_t tag_offset; \ type value; \ tag_offset = (bus_addr_t)tag->bs_privdata; \ value = base(NULL, bsh + tag_offset, offset); \ return (value); \ } READ_SINGLE(u_int8_t, pxa_bs_r_1, generic_bs_r_1) READ_SINGLE(u_int16_t, pxa_bs_r_2, generic_bs_r_2) READ_SINGLE(u_int32_t, pxa_bs_r_4, generic_bs_r_4) #undef READ_SINGLE #define WRITE_SINGLE(type, proto, base) \ void \ proto(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, \ type value) \ { \ bus_addr_t tag_offset; \ tag_offset = (bus_addr_t)tag->bs_privdata; \ base(NULL, bsh + tag_offset, offset, value); \ } WRITE_SINGLE(u_int8_t, pxa_bs_w_1, generic_bs_w_1) WRITE_SINGLE(u_int16_t, pxa_bs_w_2, generic_bs_w_2) WRITE_SINGLE(u_int32_t, pxa_bs_w_4, generic_bs_w_4) #undef WRITE_SINGLE #define READ_MULTI(type, proto, base) \ void \ proto(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, \ type *dest, bus_size_t count) \ { \ bus_addr_t tag_offset; \ tag_offset = (bus_addr_t)tag->bs_privdata; \ base(NULL, bsh + tag_offset, offset, dest, count); \ } READ_MULTI(u_int8_t, pxa_bs_rm_1, generic_bs_rm_1) READ_MULTI(u_int16_t, pxa_bs_rm_2, generic_bs_rm_2) READ_MULTI(u_int8_t, pxa_bs_rr_1, generic_bs_rr_1) #undef READ_MULTI #define WRITE_MULTI(type, proto, base) \ void \ proto(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, \ const type *src, bus_size_t count) \ { \ bus_addr_t tag_offset; \ tag_offset = (bus_addr_t)tag->bs_privdata; \ base(NULL, bsh + tag_offset, offset, src, count); \ } WRITE_MULTI(u_int8_t, pxa_bs_wm_1, generic_bs_wm_1) WRITE_MULTI(u_int16_t, pxa_bs_wm_2, generic_bs_wm_2) #undef WRITE_MULTI