Hash!!!!!!!!!!!!!!!! I've committed the same change.
From: Takahiro HAYASHI <h...@abox3.so-net.ne.jp> Subject: Re: CVS commit: src/sys/dev/pci Date: Sun, 27 Jun 2010 22:28:32 +0900 > Hi, > > On Sun, 27 Jun 2010 11:14:44 +0200 > Tobias Nygren <t...@netbsd.org> wrote: > >> On Fri, 25 Jun 2010 04:03:14 +0000 >> SAITOH Masanobu <msai...@netbsd.org> wrote: >> >> > Modified Files: >> > src/sys/dev/pci: if_wm.c if_wmreg.h >> > >> > Log Message: >> > Add some code to support 82580[ER]. Tested on my own I340-T4. >> >> Hi, >> >> My wm0 does not attach anymore. >> >> Kernel from 2010-06-20: >> wm0 at pci3 dev 6 function 0: Intel i82541PI 1000BASE-T Ethernet, rev. 5 >> wm0: interrupting at ioapic0 pin 21 >> wm0: 32-bit 33MHz PCI bus >> wm0: 64 word (6 address bits) MicroWire EEPROM >> wm0: Ethernet address 00:1b:21:4d:a9:66 >> igphy0 at wm0 phy 1: Intel IGP01E1000 Gigabit PHY, rev. 0 >> >> Today's kernel: >> wm0 at pci3 dev 6 function 0: Intel i82541PI 1000BASE-T Ethernet, rev. 5 >> wm0: interrupting at ioapic0 pin 21 >> wm0: 32-bit 33MHz PCI bus >> wm0: 64 word (6 address bits) MicroWire EEPROM >> >> No error messages(?), but apparently the mac address didn't read out and >> the phy didn't attach. > > I see same message with i82540EM (0x100e8086) card. > Should if_wm.c be like this? > > Index: sys/dev/pci/if_wm.c > =================================================================== > RCS file: /cvsroot/src/sys/dev/pci/if_wm.c,v > retrieving revision 1.209 > diff -u -u -r1.209 if_wm.c > --- sys/dev/pci/if_wm.c 25 Jun 2010 04:35:54 -0000 1.209 > +++ sys/dev/pci/if_wm.c 27 Jun 2010 13:20:55 -0000 > @@ -1607,10 +1607,11 @@ > KASSERT(prop_data_size(ea) == ETHER_ADDR_LEN); > memcpy(enaddr, prop_data_data_nocopy(ea), ETHER_ADDR_LEN); > } else { > - if (wm_read_mac_addr(sc, enaddr) != 0) > + if (wm_read_mac_addr(sc, enaddr) != 0) { > aprint_error_dev(sc->sc_dev, > "unable to read Ethernet address\n"); > - return; > + return; > + } > } > > aprint_normal_dev(sc->sc_dev, "Ethernet address %s\n", > > > -- > Takahiro Hayashi <h...@abox3.so-net.ne.jp> ---------------------------------------------------------- SAITOH Masanobu (masan...@iij.ad.jp msai...@netbsd.org)