 @@ -1,14 +1,14 @@
-/* $NetBSD: dwc_gmac.c,v 1.40 2017/02/20 07:43:29 ozaki-r Exp $ */
+/* $NetBSD: dwc_gmac.c,v 1.41 2017/10/23 09:27:46 msaitoh Exp $ */
 /*-
  * Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas of 3am Software Foundry and Martin Husemann.
+ *
  * 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.
 @@ -31,27 +31,27 @@
 /*
  * This driver supports the Synopsis Designware GMAC core, as found
  * on Allwinner A20 cores and others.
+ *
  * Real documentation seems to not be available, the marketing product
  * documents could be found here:
+ *
  *  http://www.synopsys.com/dw/ipdir.php?ds=dwc_ether_mac10_100_1000_unive
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.40 2017/02/20 07:43:29 ozaki-r Exp $");
+__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.41 2017/10/23 09:27:46 msaitoh Exp $");
 /* #define	DWC_GMAC_DEBUG	1 */
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <sys/systm.h>
 @@ -136,26 +136,27 @@ static void dwc_gmac_dump_ffilt(struct d
 #ifdef NET_MPSAFE
 #define DWCGMAC_MPSAFE	1
 #endif
 void
 dwc_gmac_attach(struct dwc_gmac_softc *sc, uint32_t mii_clk)
+{
 	uint8_t enaddr[ETHER_ADDR_LEN];
 	uint32_t maclo, machi;
 	struct mii_data * const mii = &sc->sc_mii;
 	struct ifnet * const ifp = &sc->sc_ec.ec_if;
 	prop_dictionary_t dict;
 	int rv;
 	mutex_init(&sc->sc_mdio_lock, MUTEX_DEFAULT, IPL_NET);
 	sc->sc_mii_clk = mii_clk & 7;
 	dict = device_properties(sc->sc_dev);
 	prop_data_t ea = dict ? prop_dictionary_get(dict, "mac-address") : NULL;
 	if (ea != NULL) {
 		/*
 		 * If the MAC address is overriden by a device property,
 		 * use that.
 		 */
 		KASSERT(prop_object_type(ea) == PROP_TYPE_DATA);
 		KASSERT(prop_data_size(ea) == ETHER_ADDR_LEN);
 @@ -249,48 +250,57 @@ dwc_gmac_attach(struct dwc_gmac_softc *s
         } else {
                 ifmedia_set(&mii->mii_media, IFM_ETHER|IFM_AUTO);
+        }
 	/*
 	 * We can support 802.1Q VLAN-sized frames.
 	 */
 	sc->sc_ec.ec_capabilities |= ETHERCAP_VLAN_MTU;
 	/*
 	 * Ready, attach interface
 	 */
 	/* Attach the interface. */
-	if_initialize(ifp);
+	rv = if_initialize(ifp);
 	if (rv != 0)
 		goto fail_2;
 	sc->sc_ipq = if_percpuq_create(&sc->sc_ec.ec_if);
 	if_deferred_start_init(ifp, NULL);
 	ether_ifattach(ifp, enaddr);
 	ether_set_ifflags_cb(&sc->sc_ec, dwc_gmac_ifflags_cb);
 	if_register(ifp);
 	/*
 	 * Enable interrupts
 	 */
 	mutex_enter(sc->sc_lock);
 	bus_space_write_4(sc->sc_bst, sc->sc_bsh, AWIN_GMAC_MAC_INTMASK,
 	    AWIN_DEF_MAC_INTRMASK);
 	bus_space_write_4(sc->sc_bst, sc->sc_bsh, AWIN_GMAC_DMA_INTENABLE,
 	    GMAC_DEF_DMA_INT_MASK);
 	mutex_exit(sc->sc_lock);
 	return;
 fail_2:
 	ifmedia_removeall(&mii->mii_media);
 	mii_detach(&mii, MII_PHY_ANY, MII_OFFSET_ANY);
 	mutex_destroy(&sc->sc_txq.t_mtx);
 	mutex_destroy(&sc->sc_rxq.r_mtx);
 	mutex_obj_free(sc->sc_lock);
 fail:
 	dwc_gmac_free_rx_ring(sc, &sc->sc_rxq);
 	dwc_gmac_free_tx_ring(sc, &sc->sc_txq);
 	dwc_gmac_free_dma_rings(sc);
 	mutex_destroy(&sc->sc_mdio_lock);
+}
 static int
 dwc_gmac_reset(struct dwc_gmac_softc *sc)
+{
 	size_t cnt;
 	bus_space_write_4(sc->sc_bst, sc->sc_bsh, AWIN_GMAC_DMA_BUSMODE,
 	    bus_space_read_4(sc->sc_bst, sc->sc_bsh, AWIN_GMAC_DMA_BUSMODE) | GMAC_BUSMODE_RESET);
 	for (cnt = 0; cnt < 3000; cnt++) {
 		if ((bus_space_read_4(sc->sc_bst, sc->sc_bsh, AWIN_GMAC_DMA_BUSMODE)
 		    & GMAC_BUSMODE_RESET) == 0)