rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-10-14 05:11:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add device tree support for Altera/Intel Cyclone V

Browse Source 
Close #3290.
This commit is contained in:
Sebastian Huber
2018-02-05 13:57:11 +01:00
parent 9906c4a5ee
commit c30fa94277
10 changed files with 321 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
freebsd/sys/dev/dwc/if_dwc.c
View File

@@ -69,12 +69,8 @@ __FBSDID("$FreeBSD$");
#include <dev/dwc/if_dwcvar.h> #include <dev/dwc/if_dwcvar.h>
#include <dev/mii/mii.h> #include <dev/mii/mii.h>
#include <dev/mii/miivar.h> #include <dev/mii/miivar.h>
#ifndef __rtems__
#include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h> #include <dev/ofw/ofw_bus_subr.h>
#else /* __rtems__ */
#include <rtems/bsd/bsd.h>
#endif /* __rtems__ */
#ifdef EXT_RESOURCES #ifdef EXT_RESOURCES
#include <dev/extres/clk/clk.h> #include <dev/extres/clk/clk.h>
@@ -1159,10 +1155,14 @@ out:
static int static int
dwc_get_hwaddr(struct dwc_softc *sc, uint8_t *hwaddr) dwc_get_hwaddr(struct dwc_softc *sc, uint8_t *hwaddr)
{ {
#ifndef __rtems__
uint32_t hi, lo, rnd; uint32_t hi, lo, rnd;
#else /* __rtems__ */ #ifdef __rtems__
uint32_t hi, lo; int i;
i = OF_getprop(ofw_bus_get_node(sc->dev), "local-mac-address",
hwaddr, 6);
if (i == 6)
return (0);
#endif /* __rtems__ */ #endif /* __rtems__ */
/* /*
@@ -1184,7 +1184,6 @@ dwc_get_hwaddr(struct dwc_softc *sc, uint8_t *hwaddr)
hwaddr[4] = (hi >> 0) & 0xff; hwaddr[4] = (hi >> 0) & 0xff;
hwaddr[5] = (hi >> 8) & 0xff; hwaddr[5] = (hi >> 8) & 0xff;
} else { } else {
#ifndef __rtems__
rnd = arc4random() & 0x00ffffff; rnd = arc4random() & 0x00ffffff;
hwaddr[0] = 'b'; hwaddr[0] = 'b';
hwaddr[1] = 's'; hwaddr[1] = 's';
@@ -1192,10 +1191,6 @@ dwc_get_hwaddr(struct dwc_softc *sc, uint8_t *hwaddr)
hwaddr[3] = rnd >> 16; hwaddr[3] = rnd >> 16;
hwaddr[4] = rnd >> 8; hwaddr[4] = rnd >> 8;
hwaddr[5] = rnd >> 0; hwaddr[5] = rnd >> 0;
#else /* __rtems__ */
rtems_bsd_get_mac_address(device_get_name(sc->dev),
device_get_unit(sc->dev), hwaddr);
#endif /* __rtems__ */
} }
return (0); return (0);
@@ -1293,13 +1288,11 @@ static int
dwc_probe(device_t dev) dwc_probe(device_t dev)
{ {
#ifndef __rtems__
if (!ofw_bus_status_okay(dev)) if (!ofw_bus_status_okay(dev))
return (ENXIO); return (ENXIO);
if (!ofw_bus_is_compatible(dev, "snps,dwmac")) if (!ofw_bus_is_compatible(dev, "snps,dwmac"))
return (ENXIO); return (ENXIO);
#endif /* __rtems__ */
device_set_desc(dev, "Gigabit Ethernet Controller"); device_set_desc(dev, "Gigabit Ethernet Controller");
return (BUS_PROBE_DEFAULT); return (BUS_PROBE_DEFAULT);
@@ -1568,11 +1561,7 @@ driver_t dwc_driver = {
static devclass_t dwc_devclass; static devclass_t dwc_devclass;
#ifndef __rtems__
DRIVER_MODULE(dwc, simplebus, dwc_driver, dwc_devclass, 0, 0); DRIVER_MODULE(dwc, simplebus, dwc_driver, dwc_devclass, 0, 0);
#else /* __rtems__ */
DRIVER_MODULE(dwc, nexus, dwc_driver, dwc_devclass, 0, 0);
#endif /* __rtems__ */
DRIVER_MODULE(miibus, dwc, miibus_driver, miibus_devclass, 0, 0); DRIVER_MODULE(miibus, dwc, miibus_driver, miibus_devclass, 0, 0);
MODULE_DEPEND(dwc, ether, 1, 1, 1); MODULE_DEPEND(dwc, ether, 1, 1, 1);

21
freebsd/sys/dev/mii/micphy.c
View File

@@ -57,12 +57,10 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/miibus_if.h> #include <rtems/bsd/local/miibus_if.h>
#ifndef __rtems__
#include <dev/fdt/fdt_common.h> #include <dev/fdt/fdt_common.h>
#include <dev/ofw/openfirm.h> #include <dev/ofw/openfirm.h>
#include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h> #include <dev/ofw/ofw_bus_subr.h>
#endif /* __rtems__ */
#define MII_KSZPHY_EXTREG 0x0b #define MII_KSZPHY_EXTREG 0x0b
#define KSZPHY_EXTREG_WRITE (1 << 15) #define KSZPHY_EXTREG_WRITE (1 << 15)
@@ -117,7 +115,6 @@ static const struct mii_phy_funcs micphy_funcs = {
mii_phy_reset mii_phy_reset
}; };
#ifndef __rtems__
static uint32_t static uint32_t
ksz9031_read(struct mii_softc *sc, uint32_t devaddr, uint32_t reg) ksz9031_read(struct mii_softc *sc, uint32_t devaddr, uint32_t reg)
{ {
@@ -131,7 +128,6 @@ ksz9031_read(struct mii_softc *sc, uint32_t devaddr, uint32_t reg)
return (PHY_READ(sc, MII_KSZ9031_MMD_ACCESS_DATA)); return (PHY_READ(sc, MII_KSZ9031_MMD_ACCESS_DATA));
} }
#endif /* __rtems__ */
static void static void
ksz9031_write(struct mii_softc *sc, uint32_t devaddr, uint32_t reg, ksz9031_write(struct mii_softc *sc, uint32_t devaddr, uint32_t reg,
@@ -148,7 +144,6 @@ ksz9031_write(struct mii_softc *sc, uint32_t devaddr, uint32_t reg,
PHY_WRITE(sc, MII_KSZ9031_MMD_ACCESS_DATA, val); PHY_WRITE(sc, MII_KSZ9031_MMD_ACCESS_DATA, val);
} }
#ifndef __rtems__
static uint32_t static uint32_t
ksz9021_read(struct mii_softc *sc, uint32_t reg) ksz9021_read(struct mii_softc *sc, uint32_t reg)
{ {
@@ -157,7 +152,6 @@ ksz9021_read(struct mii_softc *sc, uint32_t reg)
return (PHY_READ(sc, MII_KSZPHY_EXTREG_READ)); return (PHY_READ(sc, MII_KSZPHY_EXTREG_READ));
} }
#endif /* __rtems__ */
static void static void
ksz9021_write(struct mii_softc *sc, uint32_t reg, uint32_t val) ksz9021_write(struct mii_softc *sc, uint32_t reg, uint32_t val)
@@ -167,7 +161,6 @@ ksz9021_write(struct mii_softc *sc, uint32_t reg, uint32_t val)
PHY_WRITE(sc, MII_KSZPHY_EXTREG_WRITE, val); PHY_WRITE(sc, MII_KSZPHY_EXTREG_WRITE, val);
} }
#ifndef __rtems__
static void static void
ksz90x1_load_values(struct mii_softc *sc, phandle_t node, ksz90x1_load_values(struct mii_softc *sc, phandle_t node,
uint32_t dev, uint32_t reg, char *field1, uint32_t f1mask, int f1off, uint32_t dev, uint32_t reg, char *field1, uint32_t f1mask, int f1off,
@@ -245,7 +238,6 @@ ksz9021_load_values(struct mii_softc *sc, phandle_t node)
"txd0-skew-ps", 0xf, 0, "txd1-skew-ps", 0xf, 4, "txd0-skew-ps", 0xf, 0, "txd1-skew-ps", 0xf, 4,
"txd2-skew-ps", 0xf, 8, "txd3-skew-ps", 0xf, 12); "txd2-skew-ps", 0xf, 8, "txd3-skew-ps", 0xf, 12);
} }
#endif /* __rtems__ */
static int static int
micphy_probe(device_t dev) micphy_probe(device_t dev)
@@ -258,18 +250,15 @@ static int
micphy_attach(device_t dev) micphy_attach(device_t dev)
{ {
struct mii_softc *sc; struct mii_softc *sc;
#ifndef __rtems__
phandle_t node; phandle_t node;
device_t miibus; device_t miibus;
device_t parent; device_t parent;
#endif /* __rtems__ */
sc = device_get_softc(dev); sc = device_get_softc(dev);
mii_phy_dev_attach(dev, MIIF_NOMANPAUSE, &micphy_funcs, 1); mii_phy_dev_attach(dev, MIIF_NOMANPAUSE, &micphy_funcs, 1);
mii_phy_setmedia(sc); mii_phy_setmedia(sc);
#ifndef __rtems__
miibus = device_get_parent(dev); miibus = device_get_parent(dev);
parent = device_get_parent(miibus); parent = device_get_parent(miibus);
@@ -280,16 +269,6 @@ micphy_attach(device_t dev)
ksz9031_load_values(sc, node); ksz9031_load_values(sc, node);
else else
ksz9021_load_values(sc, node); ksz9021_load_values(sc, node);
#else /* __rtems__ */
/* FIXME */
if (sc->mii_mpd_model == MII_MODEL_MICREL_KSZ9031) {
BSD_ASSERT(0);
} else {
ksz9021_write(sc, MII_KSZPHY_CLK_CONTROL_PAD_SKEW, 0xf0f0);
ksz9021_write(sc, MII_KSZPHY_RX_DATA_PAD_SKEW, 0x0000);
ksz9021_write(sc, MII_KSZPHY_TX_DATA_PAD_SKEW, 0x0000);
}
#endif /* __rtems__ */
return (0); return (0);
} }

226
freebsd/sys/dev/usb/controller/dwc_otg_fdt.c Normal file
View File

@@ -0,0 +1,226 @@
#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 <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
#include <sys/condvar.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/module.h>
#include <sys/mutex.h>
#include <sys/rman.h>
#include <dev/ofw/openfirm.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
#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 struct ofw_compat_data compat_data[] = {
{ "synopsys,designware-hs-otg2", 1 },
{ "snps,dwc2", 1 },
{ NULL, 0 }
};
static int
dwc_otg_probe(device_t dev)
{
if (!ofw_bus_status_okay(dev))
return (ENXIO);
if (!ofw_bus_search_compatible(dev, compat_data)->ocd_data)
return (ENXIO);
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;
/* 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);
}
}
/* 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);
/*
* brcm,bcm2708-usb FDT provides two interrupts,
* we need only second one (VC_USB)
*/
rid = ofw_bus_is_compatible(dev, "brcm,bcm2708-usb") ? 1 : 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);
}
int
dwc_otg_detach(device_t dev)
{
struct dwc_otg_fdt_softc *sc = device_get_softc(dev);
int err;
/* 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);

40
freebsd/sys/dev/usb/controller/dwc_otg_fdt.h Normal file
View File

@@ -0,0 +1,40 @@
/*-
* 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;
device_attach_t dwc_otg_detach;
#endif

5
libbsd.py
View File

@@ -1,7 +1,7 @@
# #
# Copyright (c) 2015-2016 Chris Johns <chrisj@rtems.org>. All rights reserved. # Copyright (c) 2015-2016 Chris Johns <chrisj@rtems.org>. All rights reserved.
# #
# Copyright (c) 2009, 2016 embedded brains GmbH. All rights reserved. # Copyright (c) 2009, 2018 embedded brains GmbH. All rights reserved.
# #
# embedded brains GmbH # embedded brains GmbH
# Dornierstr. 4 # Dornierstr. 4
@@ -160,7 +160,6 @@ def rtems(mm):
'sys/dev/usb/controller/ehci_mpc83xx.c', 'sys/dev/usb/controller/ehci_mpc83xx.c',
'sys/dev/usb/controller/ohci_lpc.c', 'sys/dev/usb/controller/ohci_lpc.c',
'sys/dev/usb/controller/ohci_lpc32xx.c', 'sys/dev/usb/controller/ohci_lpc32xx.c',
'sys/dev/usb/controller/dwc_otg_nexus.c',
'sys/dev/usb/controller/usb_otg_transceiver.c', 'sys/dev/usb/controller/usb_otg_transceiver.c',
'sys/dev/usb/controller/usb_otg_transceiver_dump.c', 'sys/dev/usb/controller/usb_otg_transceiver_dump.c',
'sys/dev/smc/if_smc_nexus.c', 'sys/dev/smc/if_smc_nexus.c',
@@ -706,6 +705,7 @@ def dev_usb_controller(mm):
'sys/dev/usb/controller/ehcireg.h', 'sys/dev/usb/controller/ehcireg.h',
'sys/dev/usb/controller/uhcireg.h', 'sys/dev/usb/controller/uhcireg.h',
'sys/dev/usb/controller/xhcireg.h', 'sys/dev/usb/controller/xhcireg.h',
'sys/dev/usb/controller/dwc_otg_fdt.h',
'sys/dev/usb/controller/dwc_otg.h', 'sys/dev/usb/controller/dwc_otg.h',
'sys/dev/usb/controller/dwc_otgreg.h', 'sys/dev/usb/controller/dwc_otgreg.h',
'sys/dev/usb/controller/saf1761_otg.h', 'sys/dev/usb/controller/saf1761_otg.h',
@@ -718,6 +718,7 @@ def dev_usb_controller(mm):
'sys/dev/usb/controller/ehci.c', 'sys/dev/usb/controller/ehci.c',
'sys/dev/usb/controller/usb_controller.c', 'sys/dev/usb/controller/usb_controller.c',
'sys/dev/usb/controller/dwc_otg.c', 'sys/dev/usb/controller/dwc_otg.c',
'sys/dev/usb/controller/dwc_otg_fdt.c',
'sys/dev/usb/controller/saf1761_otg.c', 'sys/dev/usb/controller/saf1761_otg.c',
'sys/dev/usb/controller/saf1761_otg_fdt.c', 'sys/dev/usb/controller/saf1761_otg_fdt.c',
], ],

2
libbsd_waf.py
View File

@@ -1877,6 +1877,7 @@ def build(bld):
'freebsd/sys/dev/tsec/if_tsec.c', 'freebsd/sys/dev/tsec/if_tsec.c',
'freebsd/sys/dev/tsec/if_tsec_fdt.c', 'freebsd/sys/dev/tsec/if_tsec_fdt.c',
'freebsd/sys/dev/usb/controller/dwc_otg.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/ehci.c',
'freebsd/sys/dev/usb/controller/musb_otg.c', 'freebsd/sys/dev/usb/controller/musb_otg.c',
'freebsd/sys/dev/usb/controller/ohci.c', 'freebsd/sys/dev/usb/controller/ohci.c',
@@ -2385,7 +2386,6 @@ def build(bld):
'rtemsbsd/sys/dev/input/touchscreen/tsc_lpc32xx.c', 'rtemsbsd/sys/dev/input/touchscreen/tsc_lpc32xx.c',
'rtemsbsd/sys/dev/smc/if_smc_nexus.c', 'rtemsbsd/sys/dev/smc/if_smc_nexus.c',
'rtemsbsd/sys/dev/tsec/if_tsec_nexus.c', 'rtemsbsd/sys/dev/tsec/if_tsec_nexus.c',
'rtemsbsd/sys/dev/usb/controller/dwc_otg_nexus.c',
'rtemsbsd/sys/dev/usb/controller/ehci_mpc83xx.c', 'rtemsbsd/sys/dev/usb/controller/ehci_mpc83xx.c',
'rtemsbsd/sys/dev/usb/controller/ohci_lpc.c', 'rtemsbsd/sys/dev/usb/controller/ohci_lpc.c',
'rtemsbsd/sys/dev/usb/controller/ohci_lpc32xx.c', 'rtemsbsd/sys/dev/usb/controller/ohci_lpc32xx.c',

20
rtemsbsd/include/bsp/nexus-devices.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013-2015 embedded brains GmbH. All rights reserved. * Copyright (c) 2013, 2018 embedded brains GmbH. All rights reserved.
* *
* embedded brains GmbH * embedded brains GmbH
* Dornierstr. 4 * Dornierstr. 4
@@ -104,19 +104,19 @@ SYSINIT_DRIVER_REFERENCE(ukphy, miibus);
#elif defined(LIBBSP_ARM_ALTERA_CYCLONE_V_BSP_H) #elif defined(LIBBSP_ARM_ALTERA_CYCLONE_V_BSP_H)
#include <bsp/socal/hps.h> RTEMS_BSD_DEFINE_NEXUS_DEVICE(ofwbus, 0, 0, NULL);
#include <bsp/irq.h> SYSINIT_DRIVER_REFERENCE(simplebus, ofwbus);
RTEMS_BSD_DRIVER_DWC0((unsigned long) ALT_EMAC1_ADDR, RTEMS_BSD_DRIVER_DW_ETH;
ALT_INT_INTERRUPT_EMAC1_IRQ); RTEMS_BSD_DRIVER_PHY_MIC;
RTEMS_BSD_DRIVER_MIPHY;
RTEMS_BSD_DRIVER_DWCOTG0((unsigned long) ALT_USB1_ADDR, RTEMS_BSD_DRIVER_DW_OTG;
ALT_INT_INTERRUPT_USB1_IRQ);
RTEMS_BSD_DRIVER_DWC_MMC;
RTEMS_BSD_DRIVER_MMC;
RTEMS_BSD_DRIVER_USB; RTEMS_BSD_DRIVER_USB;
RTEMS_BSD_DRIVER_USB_MASS; RTEMS_BSD_DRIVER_USB_MASS;
RTEMS_BSD_DRIVER_DW_MMC;
RTEMS_BSD_DRIVER_MMC;
#elif defined(LIBBSP_ARM_IMX_BSP_H) #elif defined(LIBBSP_ARM_IMX_BSP_H)
RTEMS_BSD_DEFINE_NEXUS_DEVICE(ofwbus, 0, 0, NULL); RTEMS_BSD_DEFINE_NEXUS_DEVICE(ofwbus, 0, 0, NULL);

65
rtemsbsd/include/machine/rtems-bsd-nexus-bus.h
View File

@@ -45,11 +45,8 @@
* RTEMS_BSD_DRIVER_PC_LEGACY * RTEMS_BSD_DRIVER_PC_LEGACY
* *
* USB: * USB:
* RTEMS_BSD_DRIVER_DWCOTG0 * RTEMS_BSD_DRIVER_DW_OTG
* RTEMS_BSD_DRIVER_DWCOTG0_BASE_ADDR
* RTEMS_BSD_DRIVER_DWCOTG0_IRQ
* RTEMS_BSD_DRIVER_LPC32XX_OHCI * RTEMS_BSD_DRIVER_LPC32XX_OHCI
* RTEMS_BSD_DRIVER_DWC_MMC
* RTEMS_BSD_DRIVER_MMC * RTEMS_BSD_DRIVER_MMC
* RTEMS_BSD_DRIVER_USB * RTEMS_BSD_DRIVER_USB
* RTEMS_BSD_DRIVER_USB_MASS * RTEMS_BSD_DRIVER_USB_MASS
@@ -79,7 +76,7 @@
* RTEMS_BSD_DRIVER_E1000PHY * RTEMS_BSD_DRIVER_E1000PHY
* RTEMS_BSD_DRIVER_ICSPHY * RTEMS_BSD_DRIVER_ICSPHY
* RTEMS_BSD_DRIVER_REPHY * RTEMS_BSD_DRIVER_REPHY
* RTEMS_BSD_DRIVER_MIPHY * RTEMS_BSD_DRIVER_PHY_MIC
*/ */
#if !defined(RTEMS_BSD_NEXUS_BUS_h) #if !defined(RTEMS_BSD_NEXUS_BUS_h)
@@ -179,23 +176,10 @@ extern "C" {
/* /*
* Designware/Synopsys OTG USB Controller. * Designware/Synopsys OTG USB Controller.
*/ */
#if !defined(RTEMS_BSD_DRIVER_DWCOTG0) #if !defined(RTEMS_BSD_DRIVER_DW_OTG)
#define RTEMS_BSD_DRIVER_DWCOTG0(_base, _irq) \ #define RTEMS_BSD_DRIVER_DW_OTG \
static const rtems_bsd_device_resource dwcotg0_res[] = { \ SYSINIT_DRIVER_REFERENCE(dwcotg, simplebus)
{ \ #endif /* RTEMS_BSD_DRIVER_DW_OTG */
.type = RTEMS_BSD_RES_MEMORY, \
.start_request = 0, \
.start_actual = (_base) \
}, { \
.type = RTEMS_BSD_RES_IRQ, \
.start_request = 0, \
.start_actual = (_irq) \
} \
}; \
RTEMS_BSD_DEFINE_NEXUS_DEVICE(dwcotg, 0, \
RTEMS_ARRAY_SIZE(dwcotg0_res), \
&dwcotg0_res[0])
#endif /* RTEMS_BSD_DRIVER_DWCOTG0 */
/* /*
* LPC32XX OHCI. * LPC32XX OHCI.
@@ -225,10 +209,10 @@ extern "C" {
/* /*
* Designware/Synopsys MMC. * Designware/Synopsys MMC.
*/ */
#if !defined(RTEMS_BSD_DRIVER_DWC_MMC) #if !defined(RTEMS_BSD_DRIVER_DW_MMC)
#define RTEMS_BSD_DRIVER_DWC_MMC \ #define RTEMS_BSD_DRIVER_DW_MMC \
RTEMS_BSD_DEFINE_NEXUS_DEVICE(dw_mmc, 0, 0, NULL) SYSINIT_DRIVER_REFERENCE(dw_mmc, simplebus)
#endif /* RTEMS_BSD_DRIVER_DWC_MMC */ #endif /* RTEMS_BSD_DRIVER_DW_MMC */
/* /*
* Atmel Media Card Interface (MCI). * Atmel Media Card Interface (MCI).
@@ -249,7 +233,7 @@ extern "C" {
RTEMS_BSD_DEFINE_NEXUS_DEVICE(at91_mci, 0, \ RTEMS_BSD_DEFINE_NEXUS_DEVICE(at91_mci, 0, \
RTEMS_ARRAY_SIZE(at91_mci0_res), \ RTEMS_ARRAY_SIZE(at91_mci0_res), \
&at91_mci0_res[0]) &at91_mci0_res[0])
#endif /* RTEMS_BSD_DRIVER_DWC0 */ #endif /* RTEMS_BSD_DRIVER_AT91_MCI0 */
/* /*
* MMC Driver. * MMC Driver.
@@ -391,23 +375,10 @@ extern "C" {
/* /*
* Designware/Synopsys Ethernet MAC Controller. * Designware/Synopsys Ethernet MAC Controller.
*/ */
#if !defined(RTEMS_BSD_DRIVER_DWC0) #if !defined(RTEMS_BSD_DRIVER_DW_ETH)
#define RTEMS_BSD_DRIVER_DWC0(_base, _irq) \ #define RTEMS_BSD_DRIVER_DW_ETH \
static const rtems_bsd_device_resource dwc0_res[] = { \ SYSINIT_DRIVER_REFERENCE(dwc, simplebus);
{ \ #endif /* RTEMS_BSD_DRIVER_DW_ETH */
.type = RTEMS_BSD_RES_MEMORY, \
.start_request = 0, \
.start_actual = (_base) \
}, { \
.type = RTEMS_BSD_RES_IRQ, \
.start_request = 0, \
.start_actual = (_irq) \
} \
}; \
RTEMS_BSD_DEFINE_NEXUS_DEVICE(dwc, 0, \
RTEMS_ARRAY_SIZE(dwc0_res), \
&dwc0_res[0])
#endif /* RTEMS_BSD_DRIVER_DWC0 */
/* /*
* NXP QorIQ Network Driver. * NXP QorIQ Network Driver.
@@ -501,10 +472,10 @@ extern "C" {
/* /*
* MI PHY. * MI PHY.
*/ */
#if !defined(RTEMS_BSD_DRIVER_MIPHY) #if !defined(RTEMS_BSD_DRIVER_PHY_MIC)
#define RTEMS_BSD_DRIVER_MIPHY \ #define RTEMS_BSD_DRIVER_PHY_MIC \
SYSINIT_DRIVER_REFERENCE(micphy, miibus); SYSINIT_DRIVER_REFERENCE(micphy, miibus);
#endif /* RTEMS_BSD_DRIVER_MIPHY */ #endif /* RTEMS_BSD_DRIVER_PHY_MIC */
#ifdef __cplusplus #ifdef __cplusplus
} }

17
rtemsbsd/sys/dev/dw_mmc/dw_mmc.c
View File

@@ -51,6 +51,10 @@
#include <machine/cpufunc.h> #include <machine/cpufunc.h>
#include <machine/resource.h> #include <machine/resource.h>
#include <dev/ofw/openfirm.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
#include <dev/dw_mmc/dw_mmcreg.h> #include <dev/dw_mmc/dw_mmcreg.h>
#include <dev/mmc/bridge.h> #include <dev/mmc/bridge.h>
@@ -222,10 +226,21 @@ dw_mmc_fini(struct dw_mmc_softc *sc)
WR4(sc, DW_MMC_CTRL, DW_MMC_CTRL_FIFO_RESET | DW_MMC_CTRL_RESET); WR4(sc, DW_MMC_CTRL, DW_MMC_CTRL_FIFO_RESET | DW_MMC_CTRL_RESET);
} }
static struct ofw_compat_data compat_data[] = {
{"altr,socfpga-dw-mshc", 1},
{NULL, 0},
};
static int static int
dw_mmc_probe(device_t dev) dw_mmc_probe(device_t dev)
{ {
if (!ofw_bus_status_okay(dev))
return (ENXIO);
if (!ofw_bus_search_compatible(dev, compat_data)->ocd_data)
return (ENXIO);
device_set_desc(dev, "DesignWare Mobile Storage Host"); device_set_desc(dev, "DesignWare Mobile Storage Host");
return (0); return (0);
} }
@@ -1102,6 +1117,6 @@ static driver_t dw_mmc_driver = {
static devclass_t dw_mmc_devclass; static devclass_t dw_mmc_devclass;
DRIVER_MODULE(dw_mmc, nexus, dw_mmc_driver, dw_mmc_devclass, NULL, NULL); DRIVER_MODULE(dw_mmc, simplebus, dw_mmc_driver, dw_mmc_devclass, NULL, NULL);
DRIVER_MODULE(mmc, dw_mmc, mmc_driver, mmc_devclass, NULL, NULL); DRIVER_MODULE(mmc, dw_mmc, mmc_driver, mmc_devclass, NULL, NULL);
MODULE_DEPEND(dw_mmc, mmc, 1, 1, 1); MODULE_DEPEND(dw_mmc, mmc, 1, 1, 1);

156
rtemsbsd/sys/dev/usb/controller/dwc_otg_nexus.c
View File

@@ -1,156 +0,0 @@
/*-
* Copyright (c) 2012 Hans Petter Selasky.
* Copyright (c) 2015 embedded brains GmbH.
* 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 <machine/rtems-bsd-kernel-space.h>
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
#include <sys/condvar.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/module.h>
#include <sys/mutex.h>
#include <sys/rman.h>
#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>
static device_probe_t dwc_otg_probe;
static device_detach_t dwc_otg_detach;
static int
dwc_otg_probe(device_t dev)
{
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_softc *sc = device_get_softc(dev);
char usb_mode[24];
int err;
int rid;
/* initialise some bus fields */
sc->sc_bus.parent = dev;
sc->sc_bus.devices = sc->sc_devices;
sc->sc_bus.devices_max = DWC_OTG_MAX_DEVICES;
sc->sc_bus.dma_bits = 32;
/* force USB host mode */
sc->sc_mode = DWC_MODE_HOST;
/* get all DMA memory */
if (usb_bus_mem_alloc_all(&sc->sc_bus,
USB_GET_DMA_TAG(dev), NULL)) {
return (ENOMEM);
}
rid = 0;
sc->sc_io_res =
bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE);
if (!(sc->sc_io_res)) {
err = ENOMEM;
goto error;
}
sc->sc_io_tag = rman_get_bustag(sc->sc_io_res);
sc->sc_io_hdl = rman_get_bushandle(sc->sc_io_res);
sc->sc_io_size = rman_get_size(sc->sc_io_res);
rid = 0;
sc->sc_irq_res =
bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE);
if (sc->sc_irq_res == NULL)
goto error;
sc->sc_bus.bdev = device_add_child(dev, "usbus", -1);
if (sc->sc_bus.bdev == NULL)
goto error;
device_set_ivars(sc->sc_bus.bdev, &sc->sc_bus);
err = bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_TTY | INTR_MPSAFE,
&dwc_otg_filter_interrupt, &dwc_otg_interrupt, sc, &sc->sc_intr_hdl);
if (err) {
sc->sc_intr_hdl = NULL;
goto error;
}
err = dwc_otg_init(sc);
if (err == 0) {
err = device_probe_and_attach(sc->sc_bus.bdev);
}
if (err)
goto error;
return (0);
error:
return (ENXIO);
}
static device_method_t dwc_otg_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, dwc_otg_probe),
DEVMETHOD(device_attach, dwc_otg_attach),
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_softc),
};
static devclass_t dwc_otg_devclass;
DRIVER_MODULE(dwcotg, nexus, dwc_otg_driver, dwc_otg_devclass, 0, 0);
MODULE_DEPEND(dwcotg, usb, 1, 1, 1);