version 1.244, 2013/02/13 12:28:23 |
version 1.245, 2013/02/13 16:58:04 |
Line 6306 wm_gmii_mediainit(struct wm_softc *sc, p |
|
Line 6306 wm_gmii_mediainit(struct wm_softc *sc, p |
|
break; |
break; |
case PCI_PRODUCT_INTEL_PCH2_LV_LM: |
case PCI_PRODUCT_INTEL_PCH2_LV_LM: |
case PCI_PRODUCT_INTEL_PCH2_LV_V: |
case PCI_PRODUCT_INTEL_PCH2_LV_V: |
/* 82578 */ |
/* 82579 */ |
sc->sc_phytype = WMPHY_82579; |
sc->sc_phytype = WMPHY_82579; |
mii->mii_readreg = wm_gmii_hv_readreg; |
mii->mii_readreg = wm_gmii_hv_readreg; |
mii->mii_writereg = wm_gmii_hv_writereg; |
mii->mii_writereg = wm_gmii_hv_writereg; |
Line 6771 wm_gmii_bm_readreg(device_t self, int ph |
|
Line 6771 wm_gmii_bm_readreg(device_t self, int ph |
|
|
|
if (reg > BME1000_MAX_MULTI_PAGE_REG) { |
if (reg > BME1000_MAX_MULTI_PAGE_REG) { |
if (phy == 1) |
if (phy == 1) |
wm_gmii_i82544_writereg(self, phy, 0x1f, |
wm_gmii_i82544_writereg(self, phy, MII_IGPHY_PAGE_SELECT, |
reg); |
reg); |
else |
else |
wm_gmii_i82544_writereg(self, phy, |
wm_gmii_i82544_writereg(self, phy, |
Line 6806 wm_gmii_bm_writereg(device_t self, int p |
|
Line 6806 wm_gmii_bm_writereg(device_t self, int p |
|
|
|
if (reg > BME1000_MAX_MULTI_PAGE_REG) { |
if (reg > BME1000_MAX_MULTI_PAGE_REG) { |
if (phy == 1) |
if (phy == 1) |
wm_gmii_i82544_writereg(self, phy, 0x1f, |
wm_gmii_i82544_writereg(self, phy, MII_IGPHY_PAGE_SELECT, |
reg); |
reg); |
else |
else |
wm_gmii_i82544_writereg(self, phy, |
wm_gmii_i82544_writereg(self, phy, |
Line 7385 wm_valid_nvm_bank_detect_ich8lan(struct |
|
Line 7385 wm_valid_nvm_bank_detect_ich8lan(struct |
|
/* Value of bit 22 corresponds to the flash bank we're on. */ |
/* Value of bit 22 corresponds to the flash bank we're on. */ |
*bank = (CSR_READ(sc, WMREG_EECD) & EECD_SEC1VAL) ? 1 : 0; |
*bank = (CSR_READ(sc, WMREG_EECD) & EECD_SEC1VAL) ? 1 : 0; |
} else { |
} else { |
uint8_t bank_high_byte; |
uint8_t sig_byte; |
wm_read_ich8_byte(sc, act_offset, &bank_high_byte); |
wm_read_ich8_byte(sc, act_offset, &sig_byte); |
if ((bank_high_byte & 0xc0) == 0x80) |
if ((sig_byte & ICH_NVM_VALID_SIG_MASK) == ICH_NVM_SIG_VALUE) |
*bank = 0; |
*bank = 0; |
else { |
else { |
wm_read_ich8_byte(sc, act_offset + bank1_offset, |
wm_read_ich8_byte(sc, act_offset + bank1_offset, |
&bank_high_byte); |
&sig_byte); |
if ((bank_high_byte & 0xc0) == 0x80) |
if ((sig_byte & ICH_NVM_VALID_SIG_MASK) |
|
== ICH_NVM_SIG_VALUE) |
*bank = 1; |
*bank = 1; |
else { |
else { |
aprint_error_dev(sc->sc_dev, |
aprint_error_dev(sc->sc_dev, |