 @@ -1,14 +1,14 @@
-/* $NetBSD: bcmgenet.c,v 1.6 2020/05/25 19:49:28 jmcneill Exp $ */
+/* $NetBSD: bcmgenet.c,v 1.7 2020/06/27 13:34:20 jmcneill Exp $ */
 /*-
  * Copyright (c) 2020 Jared McNeill <jmcneill@invisible.ca>
  * 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.
 @@ -24,27 +24,27 @@
  * 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.
  */
 /*
  * Broadcom GENETv5
  */
 #include "opt_net_mpsafe.h"
 #include "opt_ddb.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcmgenet.c,v 1.6 2020/05/25 19:49:28 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcmgenet.c,v 1.7 2020/06/27 13:34:20 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/mutex.h>
 #include <sys/callout.h>
 #include <sys/cprng.h>
 #include <net/if.h>
 #include <net/if_dl.h>
 @@ -826,27 +826,27 @@ genet_ioctl(struct ifnet *ifp, u_long cm
+}
 static void
 genet_get_eaddr(struct genet_softc *sc, uint8_t *eaddr)
+{
 	prop_dictionary_t prop = device_properties(sc->sc_dev);
 	uint32_t maclo, machi, val;
 	prop_data_t eaprop;
 	eaprop = prop_dictionary_get(prop, "mac-address");
 	if (eaprop != NULL) {
 		KASSERT(prop_object_type(eaprop) == PROP_TYPE_DATA);
 		KASSERT(prop_data_size(eaprop) == ETHER_ADDR_LEN);
-		memcpy(eaddr, prop_data_data_nocopy(eaprop),
+		memcpy(eaddr, prop_data_value(eaprop),
 		    ETHER_ADDR_LEN);
 		return;
+	}
 	maclo = machi = 0;
 	val = RD4(sc, GENET_SYS_RBUF_FLUSH_CTRL);
 	if ((val & GENET_SYS_RBUF_FLUSH_RESET) == 0) {
 		maclo = htobe32(RD4(sc, GENET_UMAC_MAC0));
 		machi = htobe16(RD4(sc, GENET_UMAC_MAC1) & 0xffff);
+	}
 	if (maclo == 0 && machi == 0) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dm9000.c,v 1.28 2020/04/02 13:38:50 nisimura Exp $	*/
+/*	$NetBSD: dm9000.c,v 1.29 2020/06/27 13:34:20 jmcneill Exp $	*/
 /*
  * Copyright (c) 2009 Paul Fleischer
  * All rights reserved.
+ *
  * 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.
  * 3. The name of the company nor the name of the author may be used to
  *    endorse or promote products derived from this software without specific
  *    prior written permission.
 @@ -214,27 +214,27 @@ dme_attach(struct dme_softc *sc, const u
 		    "DM9000 was configured with MAC address: %s\n",
 		    ether_sprintf(enaddr));
+	}
 #endif
 	dict = device_properties(sc->sc_dev);
 	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);
-		memcpy(enaddr, prop_data_data_nocopy(ea), ETHER_ADDR_LEN);
+		memcpy(enaddr, prop_data_value(ea), ETHER_ADDR_LEN);
 		aprint_debug_dev(sc->sc_dev, "got MAC address!\n");
 	} else {
 		/*
 		 * If we did not get an externaly configure address,
 		 * try to read one from the current setup, before
 		 * resetting the chip.
 		 */
 		dme_read_c(sc, DM9000_PAB0, enaddr, 6);
 		if (ETHER_IS_ONE(enaddr) || ETHER_IS_ZERO(enaddr)) {
 			/* make a random MAC address */
 			uint32_t maclo = 0x00f2 | (cprng_strong32() << 16);
 			uint32_t machi = cprng_strong32();
 			enaddr[0] = maclo;

 @@ -1,14 +1,14 @@
-/* $NetBSD: dwc_gmac.c,v 1.70 2020/05/17 21:50:47 chs Exp $ */
+/* $NetBSD: dwc_gmac.c,v 1.71 2020/06/27 13:34:20 jmcneill 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.70 2020/05/17 21:50:47 chs Exp $");
+__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.71 2020/06/27 13:34:20 jmcneill 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>
 @@ -192,27 +192,27 @@ dwc_gmac_attach(struct dwc_gmac_softc *s
 	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);
-		memcpy(enaddr, prop_data_data_nocopy(ea), ETHER_ADDR_LEN);
+		memcpy(enaddr, prop_data_value(ea), ETHER_ADDR_LEN);
 	} else {
 		/*
 		 * If we did not get an externaly configure address,
 		 * try to read one from the current filter setup,
 		 * before resetting the chip.
 		 */
 		maclo = bus_space_read_4(sc->sc_bst, sc->sc_bsh,
 		    AWIN_GMAC_MAC_ADDR0LO);
 		machi = bus_space_read_4(sc->sc_bst, sc->sc_bsh,
 		    AWIN_GMAC_MAC_ADDR0HI);
 		if (maclo == 0xffffffff && (machi & 0xffff) == 0xffff) {
 			/* fake MAC address */