 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_enet.c,v 1.24 2019/07/23 06:36:36 hkenken Exp $	*/
+/*	$NetBSD: if_enet.c,v 1.25 2019/07/30 06:26:31 hkenken Exp $	*/
 /*
  * Copyright (c) 2014 Ryo Shimizu <ryo@nerv.org>
  * 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.
 @@ -21,27 +21,27 @@
  * (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.
  */
 /*
  * i.MX6,7 10/100/1000-Mbps ethernet MAC (ENET)
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.24 2019/07/23 06:36:36 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.25 2019/07/30 06:26:31 hkenken Exp $");
 #include "vlan.h"
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/mbuf.h>
 #include <sys/device.h>
 #include <sys/sockio.h>
 #include <sys/kernel.h>
 #include <sys/rndsource.h>
 #include <lib/libkern/libkern.h>
 @@ -156,29 +156,26 @@ static void enet_setmulti(struct enet_so
 static int enet_encap_mbufalign(struct mbuf **);
 static int enet_encap_txring(struct enet_softc *, struct mbuf **);
 static int enet_init_regs(struct enet_softc *, int);
 static int enet_alloc_ring(struct enet_softc *);
 static void enet_init_txring(struct enet_softc *);
 static int enet_init_rxring(struct enet_softc *);
 static void enet_reset_rxdesc(struct enet_softc *, int);
 static int enet_alloc_rxbuf(struct enet_softc *, int);
 static void enet_drain_txbuf(struct enet_softc *);
 static void enet_drain_rxbuf(struct enet_softc *);
 static int enet_alloc_dma(struct enet_softc *, size_t, void **,
 			  bus_dmamap_t *);
 CFATTACH_DECL_NEW(enet, sizeof(struct enet_softc),
     enet_match, enet_attach, NULL, NULL);
 int
 enet_attach_common(device_t self)
+{
 	struct enet_softc *sc = device_private(self);
 	struct ifnet *ifp;
 	struct mii_data * const mii = &sc->sc_mii;
 	/* allocate dma buffer */
 	if (enet_alloc_ring(sc))
 		return -1;
 #define IS_ENADDR_ZERO(enaddr)				\
 	((enaddr[0] | enaddr[1] | enaddr[2] |		\

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_enet_imx6.c,v 1.5 2019/07/23 06:36:36 hkenken Exp $	*/
+/*	$NetBSD: if_enet_imx6.c,v 1.6 2019/07/30 06:26:31 hkenken Exp $	*/
 /*
  * Copyright (c) 2014 Ryo Shimizu <ryo@nerv.org>
  * 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.
 @@ -17,46 +17,49 @@
  * 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 <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_enet_imx6.c,v 1.5 2019/07/23 06:36:36 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_enet_imx6.c,v 1.6 2019/07/30 06:26:31 hkenken Exp $");
 #include "locators.h"
 #include "imxccm.h"
 #include "imxocotp.h"
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <arm/imx/imx6var.h>
 #include <arm/imx/imx6_reg.h>
 #include <arm/imx/imx6_ccmreg.h>
 #include <arm/imx/imx6_ccmvar.h>
 #include <arm/imx/imx6_iomuxreg.h>
 #include <arm/imx/imx6_ocotpreg.h>
 #include <arm/imx/imx6_ocotpvar.h>
 #include <arm/imx/if_enetreg.h>
 #include <arm/imx/if_enetvar.h>
 CFATTACH_DECL_NEW(enet, sizeof(struct enet_softc),
     enet_match, enet_attach, NULL, NULL);
 static int enet_init_clocks(struct enet_softc *);
 int
 enet_match(device_t parent __unused, struct cfdata *match __unused, void *aux)
+{
 	struct axi_attach_args *aa;
 	aa = aux;
 	switch (aa->aa_addr) {
 	case (IMX6_AIPS2_BASE + AIPS2_ENET_BASE):
 		return 1;
 	case (IMX6_AIPS1_BASE + AIPS1_ENET2_BASE):

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_enet_imx7.c,v 1.3 2019/07/23 06:36:36 hkenken Exp $	*/
+/*	$NetBSD: if_enet_imx7.c,v 1.4 2019/07/30 06:26:31 hkenken Exp $	*/
 /*
  * Copyright (c) 2014 Ryo Shimizu <ryo@nerv.org>
  * 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.
 @@ -17,45 +17,48 @@
  * 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 <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_enet_imx7.c,v 1.3 2019/07/23 06:36:36 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_enet_imx7.c,v 1.4 2019/07/30 06:26:31 hkenken Exp $");
 #include "locators.h"
 #include "imxccm.h"
 #include "imxocotp.h"
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <arm/imx/imx7var.h>
 #include <arm/imx/imx7reg.h>
 #include <arm/imx/imx7_ccmreg.h>
 #include <arm/imx/imx7_ccmvar.h>
 #include <arm/imx/imx7_ocotpreg.h>
 #include <arm/imx/imx7_ocotpvar.h>
 #include <arm/imx/if_enetreg.h>
 #include <arm/imx/if_enetvar.h>
 CFATTACH_DECL_NEW(enet, sizeof(struct enet_softc),
     enet_match, enet_attach, NULL, NULL);
 static void get_mac_from_ocotp(struct enet_softc *, device_t self,
     const char *);
 int
 enet_match(device_t parent __unused, struct cfdata *match __unused, void *aux)
+{
 	struct axi_attach_args *aa;
 	aa = aux;
 	switch (aa->aa_addr) {
 	case (IMX7_AIPS_BASE + AIPS3_ENET1_BASE):
 		return 1;

 @@ -1,14 +1,14 @@
-#	$NetBSD: files.imx6,v 1.2 2019/07/27 08:02:04 skrll Exp $
+#	$NetBSD: files.imx6,v 1.3 2019/07/30 06:26:31 hkenken Exp $
+#
 # Configuration info for the Freescale i.MX6
+#
 file	arch/arm/arm32/arm32_boot.c
 file	arch/arm/arm32/arm32_kvminit.c
 file	arch/arm/arm32/arm32_reboot.c
 file	arch/arm/arm32/irq_dispatch.S
 file	arch/arm/arm32/armv7_generic_space.c
 file	arch/arm/arm/arm_generic_dma.c
 file	arch/arm/arm/bus_space_a4x.S
 file	arch/arm/imx/fdt/imx6_platform.c	soc_imx
 @@ -38,29 +38,29 @@ device	imxgpio: gpiobus
 attach	imxgpio at fdt
 file	arch/arm/imx/imxgpio.c		imxgpio		needs-flag
 file	arch/arm/imx/fdt/imx6_gpio.c	imxgpio
 # UART
 device	imxuart { } : bus_space_generic
 attach	imxuart at fdt with imx6_com
 file	arch/arm/imx/imxuart.c		imxuart	needs-flag
 file	arch/arm/imx/fdt/imx6_com.c	imx6_com needs-flag
 defflag opt_imxuart.h			IMXUARTCONSOLE
 # FEC
 device	enet: ether, ifnet, arp, mii, bus_dma_generic
-attach	enet at fdt
+attach	enet at fdt with enet_fdt
 file	arch/arm/imx/if_enet.c		enet
-file	arch/arm/imx/fdt/if_enet_imx.c	enet
+file	arch/arm/imx/fdt/if_enet_imx.c	enet_fdt
 # SATA
 attach	ahcisata at fdt with imx6_ahcisata
 file	arch/arm/imx/fdt/imx6_ahcisata.c	imx6_ahcisata
 # USB Controller
 device	imxusbc { [unit=-1], [irq=-1] } : bus_dma_generic
 attach	imxusbc at fdt with imxusbc_fdt
 file	arch/arm/imx/fdt/imx6_usb.c		imxusbc_fdt
 attach	ehci at imxusbc with imxehci
 file	arch/arm/imx/imxusb.c			imxehci

 @@ -1,75 +1,85 @@
-/*	$NetBSD: if_enet_imx.c,v 1.1 2019/07/24 13:12:33 hkenken Exp $	*/
+/*	$NetBSD: if_enet_imx.c,v 1.2 2019/07/30 06:26:31 hkenken Exp $	*/
 /*-
  * Copyright (c) 2019 Genetec Corporation.  All rights reserved.
  * Written by Hashimoto Kenichi for Genetec Corporation.
+ *
  * 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 <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_enet_imx.c,v 1.1 2019/07/24 13:12:33 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_enet_imx.c,v 1.2 2019/07/30 06:26:31 hkenken Exp $");
 #include "opt_fdt.h"
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <arm/imx/imx6var.h>
 #include <arm/imx/imx6_reg.h>
 #include <arm/imx/if_enetreg.h>
 #include <arm/imx/if_enetvar.h>
 #include <dev/fdt/fdtvar.h>
 struct enet_fdt_softc {
 	struct enet_softc sc_enet;
 	struct fdtbus_gpio_pin *sc_pin_reset;
 };
 CFATTACH_DECL_NEW(enet_fdt, sizeof(struct enet_fdt_softc),
     enet_match, enet_attach, NULL, NULL);
 static const char * const compatible[] = {
 	"fsl,imx6q-fec",
 	NULL
 };
 static int enet_init_clocks(struct enet_softc *);
-static void enet_phy_reset(const int);
+static void enet_phy_reset(struct enet_fdt_softc *, const int);
 int
 enet_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct fdt_attach_args * const faa = aux;
 	return of_match_compatible(faa->faa_phandle, compatible);
+}
 void
 enet_attach(device_t parent, device_t self, void *aux)
+{
-	struct enet_softc *sc = device_private(self);
+	struct enet_fdt_softc * const efsc = device_private(self);
 	struct enet_softc *sc = &efsc->sc_enet;
 	struct fdt_attach_args * const faa = aux;
 	const int phandle = faa->faa_phandle;
 	bus_space_tag_t bst = faa->faa_bst;
 	bus_space_handle_t bsh;
 	bus_addr_t addr;
 	bus_size_t size;
 	int error;
 	if (fdtbus_get_reg(phandle, 0, &addr, &size) != 0) {
 		aprint_error(": couldn't get enet registers\n");
 		return;
+	}
 @@ -83,27 +93,27 @@ enet_attach(device_t parent, device_t se
 	if (sc->sc_clk_enet == NULL) {
 		aprint_error(": couldn't get clock ahb\n");
 		goto failure;
+	}
 	sc->sc_clk_enet_ref= fdtbus_clock_get(phandle, "ptp");
 	if (sc->sc_clk_enet_ref == NULL) {
 		aprint_error(": couldn't get clock ptp\n");
 		goto failure;
+	}
 	aprint_naive("\n");
 	aprint_normal(": Gigabit Ethernet Controller\n");
-	enet_phy_reset(phandle);
+	enet_phy_reset(efsc, phandle);
 	sc->sc_dev = self;
 	sc->sc_iot = bst;
 	sc->sc_ioh = bsh;
 	sc->sc_dmat = faa->faa_dmat;
 	sc->sc_imxtype = 6;	/* i.MX6 */
 	sc->sc_rgmii = 1;
 	char intrstr[128];
 	if (!fdtbus_intr_str(phandle, 0, intrstr, sizeof(intrstr))) {
 		aprint_error_dev(self, "failed to decode interrupt\n");
 		goto failure;
 @@ -140,34 +150,31 @@ enet_init_clocks(struct enet_softc *sc)
 		aprint_error_dev(sc->sc_dev, "couldn't enable enet: %d\n", error);
 		return error;
+	}
 	error = clk_enable(sc->sc_clk_enet_ref);
 	if (error) {
 		aprint_error_dev(sc->sc_dev, "couldn't enable enet_ref: %d\n", error);
 		return error;
+	}
 	return 0;
+}
 static void
-enet_phy_reset(const int phandle)
+enet_phy_reset(struct enet_fdt_softc *sc, const int phandle)
+{
 	struct fdtbus_gpio_pin *reset;
 	int error;
-	reset = fdtbus_gpio_acquire(phandle, "phy-reset-gpios", GPIO_PIN_OUTPUT);
+	sc->sc_pin_reset = fdtbus_gpio_acquire(phandle, "phy-reset-gpios", GPIO_PIN_OUTPUT);
-	if (reset == NULL)
+	if (sc->sc_pin_reset == NULL)
 		return;
 	u_int msec;
 	error = of_getprop_uint32(phandle, "phy-reset-duration", &msec);
 	if (error)
 		msec = 1;
 	/* Reset */
-	fdtbus_gpio_write(reset, 1);
+	fdtbus_gpio_write(sc->sc_pin_reset, 1);
 	delay(msec * 1000);
-	fdtbus_gpio_write(reset, 0);
+	fdtbus_gpio_write(sc->sc_pin_reset, 0);
 	fdtbus_gpio_release(reset);
+}