diff options
| -rw-r--r-- | sys/arch/octeon/conf/GENERIC | 6 | ||||
| -rw-r--r-- | sys/arch/octeon/conf/files.octeon | 6 | ||||
| -rw-r--r-- | sys/arch/octeon/dev/octdwctwo.c | 117 |
3 files changed, 126 insertions, 3 deletions
diff --git a/sys/arch/octeon/conf/GENERIC b/sys/arch/octeon/conf/GENERIC index 9814ec8098a..3037b5f7ccd 100644 --- a/sys/arch/octeon/conf/GENERIC +++ b/sys/arch/octeon/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.17 2014/08/11 16:54:20 miod Exp $ +# $OpenBSD: GENERIC,v 1.18 2015/02/11 00:15:41 uebayasi Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -49,6 +49,9 @@ pci* at ppb? cn30xxgmx* at iobus? cnmac* at cn30xxgmx? +#dwctwo0 at iobus? +#usb* at dwctwo? + rgephy* at mii? ukphy* at mii? atphy* at mii? @@ -68,4 +71,3 @@ wd* at pciide? flags 0x0000 # USB devices #uhub* at usb? # USB Hubs - diff --git a/sys/arch/octeon/conf/files.octeon b/sys/arch/octeon/conf/files.octeon index d8b9ea68b5c..1fb41a37927 100644 --- a/sys/arch/octeon/conf/files.octeon +++ b/sys/arch/octeon/conf/files.octeon @@ -1,4 +1,4 @@ -# $OpenBSD: files.octeon,v 1.19 2014/07/11 21:54:38 tedu Exp $ +# $OpenBSD: files.octeon,v 1.20 2015/02/11 00:15:41 uebayasi Exp $ # Standard stanzas config(8) can't run without maxpartitions 16 @@ -31,6 +31,7 @@ include "dev/mii/files.mii" include "dev/pci/files.pci" include "dev/pckbc/files.pckbc" include "dev/usb/files.usb" +include "dev/usb/dwc2/files.dwc2" include "dev/rasops/files.rasops" include "dev/wscons/files.wscons" include "dev/wsfont/files.wsfont" @@ -65,6 +66,9 @@ file arch/octeon/dev/cn30xxipd.c iobus file arch/octeon/dev/cn30xxpko.c iobus file arch/octeon/dev/cn30xxasx.c iobus file arch/octeon/dev/cn30xxsmi.c iobus + +attach dwctwo at iobus with octdwctwo +file arch/octeon/dev/octdwctwo.c octdwctwo needs-flag # On-board CF device octcf: disk diff --git a/sys/arch/octeon/dev/octdwctwo.c b/sys/arch/octeon/dev/octdwctwo.c new file mode 100644 index 00000000000..587d357f90d --- /dev/null +++ b/sys/arch/octeon/dev/octdwctwo.c @@ -0,0 +1,117 @@ +/* $OpenBSD: octdwctwo.c,v 1.1 2015/02/11 00:15:41 uebayasi Exp $ */ + +/* + * Copyright (c) 2015 Masao Uebayashi <uebayasi@tombiinc.com> + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/device.h> +#include <sys/malloc.h> +#include <sys/pool.h> + +#include <machine/intr.h> +#include <machine/bus.h> +#include <machine/octeonreg.h> +#include <machine/octeonvar.h> + +#include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> +#include <dev/usb/usbdivar.h> +#include <dev/usb/usb_mem.h> + +#include <octeon/dev/iobusvar.h> +#include <octeon/dev/octhcireg.h> + +#include <dev/usb/dwc2/dwc2var.h> +#include <dev/usb/dwc2/dwc2.h> +#include <dev/usb/dwc2/dwc2_core.h> + +struct octdwctwo_softc { + struct dwc2_softc sc_dwc2; + void *sc_ih; +}; + +int octdwctwo_match(struct device *, void *, void *); +void octdwctwo_attach(struct device *, struct device *, + void *); +void octdwctwo_attach_deferred(struct device *); + +const struct cfattach octdwctwo_ca = { + sizeof(struct octdwctwo_softc), octdwctwo_match, octdwctwo_attach, +}; + +struct cfdriver dwctwo_cd = { + NULL, "dwctwo", DV_DULL +}; + +static struct dwc2_core_params octdwctwo_params = { +}; + +int +octdwctwo_match(struct device *parent, void *match, void *aux) +{ + return (1); +} + +void +octdwctwo_attach(struct device *parent, struct device *self, void *aux) +{ + struct octdwctwo_softc *sc = (struct octdwctwo_softc *)self; + struct iobus_attach_args *aa = aux; + int rc; + + sc->sc_dwc2.sc_iot = aa->aa_bust; + rc = bus_space_map(aa->aa_bust, USBN_BASE, USBN_SIZE, + 0, &sc->sc_dwc2.sc_ioh); + if (rc != 0) + panic(": can't map registers"); + +#if 0 + rc = bus_space_map(aa->aa_bust, USBN_2_BASE, USBN_2_SIZE, + 0, &sc->sc_dma_reg); + if (rc != 0) + panic(": can't map dma registers"); + + rc = bus_space_map(aa->aa_bust, USBC_BASE, USBC_SIZE, + 0, &sc->sc_regc); + if (rc != 0) + panic(": can't map control registers"); +#endif + + sc->sc_ih = octeon_intr_establish(CIU_INT_USB, IPL_USB, dwc2_intr, + (void *)&sc->sc_dwc2, sc->sc_dwc2.sc_bus.bdev.dv_xname); + if (sc->sc_ih == NULL) + panic(": interrupt establish failed"); + + sc->sc_dwc2.sc_bus.pipe_size = sizeof(struct usbd_pipe); + sc->sc_dwc2.sc_dmat = aa->aa_dmat; + sc->sc_dwc2.sc_params = &octdwctwo_params; + + config_found((void *)sc, &sc->sc_dwc2.sc_bus.bdev, usbctlprint); +} + +void +octdwctwo_attach_deferred(struct device *self) +{ + struct octdwctwo_softc *sc = (struct octdwctwo_softc *)self; + int error; + + error = dwc2_init(&sc->sc_dwc2); + if (error != 0) + return; + sc->sc_dwc2.sc_child = config_found(&sc->sc_dwc2.sc_bus.bdev, + &sc->sc_dwc2.sc_bus, usbctlprint); +} |