--- freebsd/sys/arm/broadcom/bcm2835/bcm283x_dwc_fdt.c | 127 ++++++++++++ freebsd/sys/dev/usb/controller/dwc_otg_fdt.c | 228 +++++++++++++++++++++ freebsd/sys/dev/usb/controller/dwc_otg_fdt.h | 39 ++++ libbsd.py | 3 + libbsd_waf.py | 4 +- rtemsbsd/include/bsp/nexus-devices.h | 21 ++ 6 files changed, 421 insertions(+), 1 deletion(-) create mode 100644 freebsd/sys/arm/broadcom/bcm2835/bcm283x_dwc_fdt.c create mode 100644 freebsd/sys/dev/usb/controller/dwc_otg_fdt.c create mode 100644 freebsd/sys/dev/usb/controller/dwc_otg_fdt.h
diff --git a/freebsd/sys/arm/broadcom/bcm2835/bcm283x_dwc_fdt.c b/freebsd/sys/arm/broadcom/bcm2835/bcm283x_dwc_fdt.c new file mode 100644 index 0000000..4c148d4 --- /dev/null +++ b/freebsd/sys/arm/broadcom/bcm2835/bcm283x_dwc_fdt.c @@ -0,0 +1,127 @@ +#include <machine/rtems-bsd-kernel-space.h> + +/* + * Copyright 2015 Andrew Turner. + * 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 <rtems/bsd/sys/param.h> +#include <sys/kernel.h> +#include <sys/bus.h> +#include <sys/callout.h> +#include <sys/condvar.h> +#include <sys/module.h> + +#ifndef __rtems__ +#include <dev/ofw/ofw_bus_subr.h> +#endif + +#include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> + +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_process.h> + +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> + +#include <dev/usb/controller/dwc_otg.h> +#include <dev/usb/controller/dwc_otg_fdt.h> + +#ifndef __rtems__ +#include <arm/broadcom/bcm2835/bcm2835_mbox_prop.h> +#else +#include <bsp/mailbox.h> +#include <bsp/vc.h> +#endif + +static device_probe_t bcm283x_dwc_otg_probe; +static device_attach_t bcm283x_dwc_otg_attach; + +static int +bcm283x_dwc_otg_probe(device_t dev) +{ + + #ifndef __rtems__ + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + + if (!ofw_bus_is_compatible(dev, "broadcom,bcm2835-usb")) + return (ENXIO); + #endif + device_set_desc(dev, "DWC OTG 2.0 integrated USB controller (bcm283x)"); + + return (BUS_PROBE_VENDOR); +} + +static int +bcm283x_dwc_otg_attach(device_t dev) +{ + int err; + + #ifndef __rtems__ + + err = bcm2835_mbox_set_power_state(BCM2835_MBOX_POWER_ID_USB_HCD, TRUE); + if (err) + device_printf(dev, "failed to set power state, err=%d\n", err); + + #else + + bcm2835_set_power_state_entries power_state_usb; + power_state_usb.dev_id = bcm2835_mailbox_power_udid_usb_hcd; + power_state_usb.state = BCM2835_MAILBOX_SET_POWER_STATE_REQ_ON; + err = bcm2835_mailbox_set_power_state(&power_state_usb); + if (err) + device_printf(dev, "failed to set power state, err=%d\n", err); + + #endif + + return (dwc_otg_attach(dev)); +} + +static device_method_t bcm283x_dwc_otg_methods[] = { + /* bus interface */ + DEVMETHOD(device_probe, bcm283x_dwc_otg_probe), + DEVMETHOD(device_attach, bcm283x_dwc_otg_attach), + + DEVMETHOD_END +}; + +static devclass_t bcm283x_dwc_otg_devclass; + +DEFINE_CLASS_1(bcm283x_dwcotg, bcm283x_dwc_otg_driver, bcm283x_dwc_otg_methods, + sizeof(struct dwc_otg_fdt_softc), dwc_otg_driver); +#ifndef __rtems__ +DRIVER_MODULE(bcm283x_dwcotg, simplebus, bcm283x_dwc_otg_driver, + bcm283x_dwc_otg_devclass, 0, 0); +#else +DRIVER_MODULE(bcm283x_dwcotg, nexus, bcm283x_dwc_otg_driver, + bcm283x_dwc_otg_devclass, 0, 0); +#endif +MODULE_DEPEND(bcm283x_dwcotg, usb, 1, 1, 1); diff --git a/freebsd/sys/dev/usb/controller/dwc_otg_fdt.c b/freebsd/sys/dev/usb/controller/dwc_otg_fdt.c new file mode 100644 index 0000000..b06fa0a --- /dev/null +++ b/freebsd/sys/dev/usb/controller/dwc_otg_fdt.c @@ -0,0 +1,228 @@ +#include <machine/rtems-bsd-kernel-space.h> + +/*- + * Copyright (c) 2012 Hans Petter Selasky. 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 <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/bus.h> +#include <sys/condvar.h> +#include <sys/kernel.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/malloc.h> +#include <sys/module.h> +#include <sys/mutex.h> +#include <sys/rman.h> + +// #include <dev/ofw/openfirm.h> +#ifndef __rtems__ +#include <dev/ofw/ofw_bus.h> +#include <dev/ofw/ofw_bus_subr.h> +#endif + +#include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> + +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_util.h> + +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> + +#include <dev/usb/controller/dwc_otg.h> +#include <dev/usb/controller/dwc_otg_fdt.h> + +static device_probe_t dwc_otg_probe; +static device_detach_t dwc_otg_detach; + +static int +dwc_otg_probe(device_t dev) +{ + + #ifndef __rtems__ + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + + if (!ofw_bus_is_compatible(dev, "synopsys,designware-hs-otg2")) + return (ENXIO); + #endif + + device_set_desc(dev, "DWC OTG 2.0 integrated USB controller"); + + return (BUS_PROBE_DEFAULT); +} + +int +dwc_otg_attach(device_t dev) +{ + struct dwc_otg_fdt_softc *sc = device_get_softc(dev); + char usb_mode[24]; + int err; + int rid; + + /* initialise some bus fields */ + sc->sc_otg.sc_bus.parent = dev; + sc->sc_otg.sc_bus.devices = sc->sc_otg.sc_devices; + sc->sc_otg.sc_bus.devices_max = DWC_OTG_MAX_DEVICES; + sc->sc_otg.sc_bus.dma_bits = 32; + +#ifndef __rtems__ + /* get USB mode, if any */ + if (OF_getprop(ofw_bus_get_node(dev), "dr_mode", + &usb_mode, sizeof(usb_mode)) > 0) { + + /* ensure proper zero termination */ + usb_mode[sizeof(usb_mode) - 1] = 0; + + if (strcasecmp(usb_mode, "host") == 0) + sc->sc_otg.sc_mode = DWC_MODE_HOST; + else if (strcasecmp(usb_mode, "peripheral") == 0) + sc->sc_otg.sc_mode = DWC_MODE_DEVICE; + else if (strcasecmp(usb_mode, "otg") != 0) { + device_printf(dev, "Invalid FDT dr_mode: %s\n", + usb_mode); + } + } +#endif + + /* get all DMA memory */ + if (usb_bus_mem_alloc_all(&sc->sc_otg.sc_bus, + USB_GET_DMA_TAG(dev), NULL)) { + return (ENOMEM); + } + rid = 0; + sc->sc_otg.sc_io_res = + bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); + + if (!(sc->sc_otg.sc_io_res)) { + err = ENOMEM; + goto error; + } + sc->sc_otg.sc_io_tag = rman_get_bustag(sc->sc_otg.sc_io_res); + sc->sc_otg.sc_io_hdl = rman_get_bushandle(sc->sc_otg.sc_io_res); + sc->sc_otg.sc_io_size = rman_get_size(sc->sc_otg.sc_io_res); + + rid = 0; + sc->sc_otg.sc_irq_res = + bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); + if (sc->sc_otg.sc_irq_res == NULL) + goto error; + + sc->sc_otg.sc_bus.bdev = device_add_child(dev, "usbus", -1); + if (sc->sc_otg.sc_bus.bdev == NULL) + goto error; + + device_set_ivars(sc->sc_otg.sc_bus.bdev, &sc->sc_otg.sc_bus); + + err = bus_setup_intr(dev, sc->sc_otg.sc_irq_res, INTR_TYPE_TTY | INTR_MPSAFE, + &dwc_otg_filter_interrupt, &dwc_otg_interrupt, sc, &sc->sc_otg.sc_intr_hdl); + if (err) { + sc->sc_otg.sc_intr_hdl = NULL; + goto error; + } + err = dwc_otg_init(&sc->sc_otg); + if (err == 0) { + err = device_probe_and_attach(sc->sc_otg.sc_bus.bdev); + } + if (err) + goto error; + + + return (0); + +error: + dwc_otg_detach(dev); + return (ENXIO); +} + +static int +dwc_otg_detach(device_t dev) +{ + struct dwc_otg_fdt_softc *sc = device_get_softc(dev); + device_t bdev; + int err; + + if (sc->sc_otg.sc_bus.bdev) { + bdev = sc->sc_otg.sc_bus.bdev; + device_detach(bdev); + device_delete_child(dev, bdev); + } + /* during module unload there are lots of children leftover */ + device_delete_children(dev); + + if (sc->sc_otg.sc_irq_res && sc->sc_otg.sc_intr_hdl) { + /* + * only call dwc_otg_uninit() after dwc_otg_init() + */ + dwc_otg_uninit(&sc->sc_otg); + + err = bus_teardown_intr(dev, sc->sc_otg.sc_irq_res, + sc->sc_otg.sc_intr_hdl); + sc->sc_otg.sc_intr_hdl = NULL; + } + /* free IRQ channel, if any */ + if (sc->sc_otg.sc_irq_res) { + bus_release_resource(dev, SYS_RES_IRQ, 0, + sc->sc_otg.sc_irq_res); + sc->sc_otg.sc_irq_res = NULL; + } + /* free memory resource, if any */ + if (sc->sc_otg.sc_io_res) { + bus_release_resource(dev, SYS_RES_MEMORY, 0, + sc->sc_otg.sc_io_res); + sc->sc_otg.sc_io_res = NULL; + } + usb_bus_mem_free_all(&sc->sc_otg.sc_bus, NULL); + + return (0); +} + +static device_method_t dwc_otg_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, dwc_otg_probe), + DEVMETHOD(device_attach, dwc_otg_attach), + DEVMETHOD(device_detach, dwc_otg_detach), + DEVMETHOD(device_suspend, bus_generic_suspend), + DEVMETHOD(device_resume, bus_generic_resume), + DEVMETHOD(device_shutdown, bus_generic_shutdown), + + DEVMETHOD_END +}; + +driver_t dwc_otg_driver = { + .name = "dwcotg", + .methods = dwc_otg_methods, + .size = sizeof(struct dwc_otg_fdt_softc), +}; + +static devclass_t dwc_otg_devclass; + +DRIVER_MODULE(dwcotg, simplebus, dwc_otg_driver, dwc_otg_devclass, 0, 0); +MODULE_DEPEND(dwcotg, usb, 1, 1, 1); diff --git a/freebsd/sys/dev/usb/controller/dwc_otg_fdt.h b/freebsd/sys/dev/usb/controller/dwc_otg_fdt.h new file mode 100644 index 0000000..9e01118 --- /dev/null +++ b/freebsd/sys/dev/usb/controller/dwc_otg_fdt.h @@ -0,0 +1,39 @@ +/*- + * Copyright (c) 2012 Hans Petter Selasky. 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. + * + * $FreeBSD$ + */ + +#ifndef _DWC_OTG_FDT_H_ +#define _DWC_OTG_FDT_H_ + +struct dwc_otg_fdt_softc { + struct dwc_otg_softc sc_otg; /* must be first */ +}; + +extern driver_t dwc_otg_driver; + +device_attach_t dwc_otg_attach; + +#endif diff --git a/libbsd.py b/libbsd.py index d2659c4..d65213d 100755 --- a/libbsd.py +++ b/libbsd.py @@ -425,6 +425,7 @@ def dev_usb(mm): 'sys/dev/usb/usb_request.c', 'sys/dev/usb/usb_transfer.c', 'sys/dev/usb/usb_util.c', + 'sys/arm/broadcom/bcm2835/bcm283x_dwc_fdt.c', ], mm.generator['source']() ) @@ -477,6 +478,7 @@ def dev_usb_controller(mm): mod.addDependency(mm['dev_usb']) mod.addKernelSpaceHeaderFiles( [ + 'sys/dev/usb/controller/dwc_otg_fdt.h', 'sys/dev/usb/controller/ohci.h', 'sys/dev/usb/controller/ohcireg.h', 'sys/dev/usb/controller/ehci.h', @@ -492,6 +494,7 @@ def dev_usb_controller(mm): 'sys/dev/usb/controller/ohci.c', 'sys/dev/usb/controller/ehci.c', 'sys/dev/usb/controller/usb_controller.c', + 'sys/dev/usb/controller/dwc_otg_fdt.c', 'sys/dev/usb/controller/dwc_otg.c', ], mm.generator['source']() diff --git a/libbsd_waf.py b/libbsd_waf.py index 918437f..70167d9 100644 --- a/libbsd_waf.py +++ b/libbsd_waf.py @@ -672,7 +672,8 @@ def build(bld): source = objs06_source) libbsd_use += ["objs06"] - source = ['freebsd/sys/arm/xilinx/zy7_slcr.c', + source = ['freebsd/sys/arm/broadcom/bcm2835/bcm283x_dwc_fdt.c', + 'freebsd/sys/arm/xilinx/zy7_slcr.c', 'freebsd/sys/cam/cam.c', 'freebsd/sys/cam/scsi/scsi_all.c', 'freebsd/sys/contrib/altq/altq/altq_cbq.c', @@ -759,6 +760,7 @@ def build(bld): 'freebsd/sys/dev/smc/if_smc.c', 'freebsd/sys/dev/tsec/if_tsec.c', 'freebsd/sys/dev/usb/controller/dwc_otg.c', + 'freebsd/sys/dev/usb/controller/dwc_otg_fdt.c', 'freebsd/sys/dev/usb/controller/ehci.c', 'freebsd/sys/dev/usb/controller/ohci.c', 'freebsd/sys/dev/usb/controller/usb_controller.c', diff --git a/rtemsbsd/include/bsp/nexus-devices.h b/rtemsbsd/include/bsp/nexus-devices.h index 3ca21f0..67be411 100644 --- a/rtemsbsd/include/bsp/nexus-devices.h +++ b/rtemsbsd/include/bsp/nexus-devices.h @@ -134,6 +134,27 @@ SYSINIT_REFERENCE(usb_quirk_init); SYSINIT_DRIVER_REFERENCE(uhub, usbus); SYSINIT_DRIVER_REFERENCE(umass, uhub); + +#elif defined(LIBBSP_ARM_RASPBERRYPI_BSP_H) + +#include <bsp/irq.h> + +static const rtems_bsd_device_resource bcm283x_dwcotg_res[] = { + { + .type = RTEMS_BSD_RES_MEMORY, + .start_request = 0, + .start_actual = 0x20980000 + }, { + .type = RTEMS_BSD_RES_IRQ, + .start_request = 0, + .start_actual = 17 + } +}; + +RTEMS_BSD_DEFINE_NEXUS_DEVICE(bcm283x_dwcotg, 0, RTEMS_ARRAY_SIZE(bcm283x_dwcotg_res), + &bcm283x_dwcotg_res[0]); +SYSINIT_DRIVER_REFERENCE(bcm283x_dwcotg, nexus); + #elif defined(LIBBSP_I386_PC386_BSP_H) RTEMS_BSD_DEFINE_NEXUS_DEVICE(legacy, 0, 0, NULL); -- 1.9.1 _______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel