From: kettenis Date: Sat, 13 Aug 2016 22:07:01 +0000 (+0000) Subject: Add the shim to make dwge(4) attach to simplebus(4). This brings us X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=4ae5daccfcce6461010c3316bac78abe5b024770;p=openbsd Add the shim to make dwge(4) attach to simplebus(4). This brings us working gigabit on the Allwinner A20. Probably won't work yet on other Allwinner SoCs due to differences in how the clocks get set up. Based on an earlier diff from patrick@. --- diff --git a/sys/arch/armv7/conf/GENERIC b/sys/arch/armv7/conf/GENERIC index 5bf8ee162f7..147766516fc 100644 --- a/sys/arch/armv7/conf/GENERIC +++ b/sys/arch/armv7/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.45 2016/08/11 04:33:06 jsg Exp $ +# $OpenBSD: GENERIC,v 1.46 2016/08/13 22:07:01 kettenis Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -94,6 +94,7 @@ sxidog* at fdt? # watchdog timer sxirtc* at fdt? # Real Time Clock sxiuart* at fdt? # onboard UARTs sxie* at fdt? +dwge* at fdt? sxiahci* at fdt? # AHCI/SATA ehci* at fdt? # EHCI (shim) usb* at ehci? #flags 0x1 diff --git a/sys/arch/armv7/conf/RAMDISK b/sys/arch/armv7/conf/RAMDISK index cfffe718334..4936f7e3ff1 100644 --- a/sys/arch/armv7/conf/RAMDISK +++ b/sys/arch/armv7/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.42 2016/08/11 04:33:06 jsg Exp $ +# $OpenBSD: RAMDISK,v 1.43 2016/08/13 22:07:01 kettenis Exp $ machine armv7 arm @@ -93,6 +93,7 @@ sxidog* at fdt? # watchdog timer sxirtc* at fdt? # Real Time Clock sxiuart* at fdt? # onboard UARTs sxie* at fdt? +dwge* at fdt? sxiahci* at fdt? # AHCI/SATA ehci* at fdt? # EHCI (shim) usb* at ehci? #flags 0x1 diff --git a/sys/arch/armv7/sunxi/files.sunxi b/sys/arch/armv7/sunxi/files.sunxi index 9a9c7a41996..063faddef3c 100644 --- a/sys/arch/armv7/sunxi/files.sunxi +++ b/sys/arch/armv7/sunxi/files.sunxi @@ -1,4 +1,4 @@ -# $OpenBSD: files.sunxi,v 1.10 2016/08/05 21:45:37 kettenis Exp $ +# $OpenBSD: files.sunxi,v 1.11 2016/08/13 22:07:01 kettenis Exp $ define sunxi {} device sunxi: sunxi @@ -49,3 +49,6 @@ file arch/armv7/sunxi/sxiuart.c sxiuart device sxie: ether, ifnet, mii, ifmedia attach sxie at fdt file arch/armv7/sunxi/sxie.c sxie + +attach dwge at fdt with dwge_fdt +file arch/armv7/sunxi/if_dwge_fdt.c dwge_fdt diff --git a/sys/arch/armv7/sunxi/if_dwge_fdt.c b/sys/arch/armv7/sunxi/if_dwge_fdt.c new file mode 100644 index 00000000000..4b8c41f35b9 --- /dev/null +++ b/sys/arch/armv7/sunxi/if_dwge_fdt.c @@ -0,0 +1,140 @@ +/* $OpenBSD: if_dwge_fdt.c,v 1.1 2016/08/13 22:07:01 kettenis Exp $ */ +/* + * Copyright (c) 2016 Patrick Wildt + * Copyright (c) 2016 Mark Kettenis + * + * Permission to use, copy, modify, and 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 +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#if NBPFILTER > 0 +#include +#endif + +#include +#include + +#include +#include + +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include + +int dwge_fdt_match(struct device *, void *, void *); +void dwge_fdt_attach(struct device *, struct device *, void *); +int dwge_fdt_intr(void *); + +struct dwge_fdt_softc { + struct dwc_gmac_softc sc_core; + void *sc_ih; +}; + +struct cfattach dwge_fdt_ca = { + sizeof(struct dwge_fdt_softc), dwge_fdt_match, dwge_fdt_attach, +}; + +int +dwge_fdt_match(struct device *parent, void *match, void *aux) +{ + struct fdt_attach_args *faa = aux; + + return OF_is_compatible(faa->fa_node, "allwinner,sun7i-a20-gmac"); +} + +void +dwge_fdt_attach(struct device *parent, struct device *self, void *aux) +{ + struct dwge_fdt_softc *fsc = (struct dwge_fdt_softc *)self; + struct dwc_gmac_softc *sc = &fsc->sc_core; + struct fdt_attach_args *faa = aux; + char phy_mode[8]; + uint32_t phy_supply; + int clock; + + if (faa->fa_nreg < 1) + return; + + pinctrl_byname(faa->fa_node, "default"); + + sc->sc_bst = faa->fa_iot; + sc->sc_dmat = faa->fa_dmat; + + printf("\n"); + + if (bus_space_map(sc->sc_bst, faa->fa_reg[0].addr, + faa->fa_reg[0].size, 0, &sc->sc_bsh)) + panic("%s: bus_space_map failed!", __func__); + + /* default to RGMII */ + OF_getprop(faa->fa_node, "phy-mode", phy_mode, sizeof(phy_mode)); + if (strcmp(phy_mode, "mii") == 0) + clock = CCMU_GMAC_MII; + else + clock = CCMU_GMAC_RGMII; + + /* enable clock */ + sxiccmu_enablemodule(clock); + delay(5000); + + /* power up phy */ + phy_supply = OF_getpropint(faa->fa_node, "phy-supply", 0); + if (phy_supply) + regulator_enable(phy_supply); + + fsc->sc_ih = arm_intr_establish_fdt(faa->fa_node, IPL_NET, + dwge_fdt_intr, sc, sc->sc_dev.dv_xname); + if (fsc->sc_ih == NULL) { + printf(": unable to establish interrupt\n"); + goto clrpwr; + } + + dwc_gmac_attach(sc, GMAC_MII_CLK_150_250M_DIV102); + + return; +clrpwr: + if (phy_supply) + regulator_disable(phy_supply); + sxiccmu_disablemodule(clock); + bus_space_unmap(sc->sc_bst, sc->sc_bsh, faa->fa_reg[0].size); +} + +int +dwge_fdt_intr(void *arg) +{ + struct dwge_fdt_softc *sc = arg; + + return dwc_gmac_intr(&sc->sc_core); +}