 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_jme.c,v 1.15 2010/11/13 13:52:06 uebayasi Exp $	*/
+/*	$NetBSD: if_jme.c,v 1.16 2011/01/09 00:12:45 kochi Exp $	*/
 /*
  * Copyright (c) 2008 Manuel Bouyer.  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.
+ *
 @@ -48,27 +48,27 @@
  * 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.
  */
 /*
  * Driver for JMicron Technologies JMC250 (Giganbit) and JMC260 (Fast)
  * Ethernet Controllers.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.15 2010/11/13 13:52:06 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.16 2011/01/09 00:12:45 kochi Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>	/* only for declaration of wakeup() used by vm.h */
 #include <sys/device.h>
 @@ -205,26 +205,27 @@ static int  jme_ifinit(struct ifnet *);
 static int  jme_init(struct ifnet *, int);
 static void jme_stop(struct ifnet *, int);
 // static void jme_restart(void *);
 static void jme_ticks(void *);
 static void jme_mac_config(jme_softc_t *);
 static void jme_set_filter(jme_softc_t *);
 int jme_mii_read(device_t, int, int);
 void jme_mii_write(device_t, int, int, int);
 void jme_statchg(device_t);
 static int jme_eeprom_read_byte(struct jme_softc *, uint8_t, uint8_t *);
 static int jme_eeprom_macaddr(struct jme_softc *);
 static int jme_reg_macaddr(struct jme_softc *);
 #define JME_TIMEOUT		1000
 #define JME_PHY_TIMEOUT		1000
 #define JME_EEPROM_TIMEOUT	1000
 static int jme_sysctl_intrxto(SYSCTLFN_PROTO);
 static int jme_sysctl_intrxct(SYSCTLFN_PROTO);
 static int jme_sysctl_inttxto(SYSCTLFN_PROTO);
 static int jme_sysctl_inttxct(SYSCTLFN_PROTO);
 static int jme_root_num;
 CFATTACH_DECL_NEW(jme, sizeof(jme_softc_t),
 @@ -374,27 +375,27 @@ jme_pci_attach(device_t parent, device_t
 	 * requires PHY probing to get correct PHY address.
 	 */
 	if ((sc->jme_flags & JME_FLAG_FPGA) == 0) {
 		sc->jme_phyaddr =
 		    bus_space_read_4(sc->jme_bt_misc, sc->jme_bh_misc,
 				     JME_GPREG0) & GPREG0_PHY_ADDR_MASK;
 	} else
 		sc->jme_phyaddr = 0;
 	jme_reset(sc);
 	/* read mac addr */
-	if (jme_eeprom_macaddr(sc)) {
+	if (jme_eeprom_macaddr(sc) && jme_reg_macaddr(sc)) {
 		aprint_error_dev(self, "error reading Ethernet address\n");
 		/* return; */
+	}
 	aprint_normal_dev(self, "Ethernet address %s\n",
 	    ether_sprintf(sc->jme_enaddr));
 	/* Map and establish interrupts */
 	if (pci_intr_map(pa, &intrhandle)) {
 		aprint_error_dev(self, "couldn't map interrupt\n");
 		return;
+	}
 	intrstr = pci_intr_string(pa->pa_pc, intrhandle);
 	sc->jme_if.if_softc = sc;
 @@ -1990,26 +1991,48 @@ jme_eeprom_macaddr(struct jme_softc *sc)
 		/* Try next eeprom descriptor. */
 		offset += JME_EEPROM_DESC_BYTES;
 	} while (match != ETHER_ADDR_LEN && offset < JME_EEPROM_END);
 	if (match == ETHER_ADDR_LEN) {
 		memcpy(sc->jme_enaddr, eaddr, ETHER_ADDR_LEN);
 		return (0);
+	}
 	return (ENOENT);
+}
 static int
 jme_reg_macaddr(struct jme_softc *sc)
+{
 	uint32_t par0, par1;
 	par0 = bus_space_read_4(sc->jme_bt_mac, sc->jme_bh_mac, JME_PAR0);
 	par1 = bus_space_read_4(sc->jme_bt_mac, sc->jme_bh_mac, JME_PAR1);
 	par1 &= 0xffff;
 	if ((par0 == 0 && par1 == 0) ||
 	    (par0 == 0xffffffff && par1 == 0xffff)) {
 		return (ENOENT);
 	} else {
 		sc->jme_enaddr[0] = (par0 >> 0) & 0xff;
 		sc->jme_enaddr[1] = (par0 >> 8) & 0xff;
 		sc->jme_enaddr[2] = (par0 >> 16) & 0xff;
 		sc->jme_enaddr[3] = (par0 >> 24) & 0xff;
 		sc->jme_enaddr[4] = (par1 >> 0) & 0xff;
 		sc->jme_enaddr[5] = (par1 >> 8) & 0xff;
+	}
 	return (0);
+}
 /*
  * Set up sysctl(3) MIB, hw.jme.* - Individual controllers will be
  * set up in jme_pci_attach()
  */
 SYSCTL_SETUP(sysctl_jme, "sysctl jme subtree setup")
+{
 	int rc;
 	const struct sysctlnode *node;
 	if ((rc = sysctl_createv(clog, 0, NULL, NULL,
 , CTLTYPE_NODE, "hw", NULL,
 	    NULL, 0, NULL, 0, CTL_HW, CTL_EOL)) != 0) {
 		goto err;