|
@@ -1112,7 +1112,10 @@ e1000_swfw_sync_acquire(struct e1000_hw *hw, uint16_t mask)
|
|
if (e1000_get_hw_eeprom_semaphore(hw))
|
|
if (e1000_get_hw_eeprom_semaphore(hw))
|
|
return -E1000_ERR_SWFW_SYNC;
|
|
return -E1000_ERR_SWFW_SYNC;
|
|
|
|
|
|
- swfw_sync = E1000_READ_REG(hw, SW_FW_SYNC);
|
|
|
|
|
|
+ if (hw->mac_type == e1000_igb)
|
|
|
|
+ swfw_sync = E1000_READ_REG(hw, I210_SW_FW_SYNC);
|
|
|
|
+ else
|
|
|
|
+ swfw_sync = E1000_READ_REG(hw, SW_FW_SYNC);
|
|
if (!(swfw_sync & (fwmask | swmask)))
|
|
if (!(swfw_sync & (fwmask | swmask)))
|
|
break;
|
|
break;
|
|
|
|
|
|
@@ -4429,7 +4432,6 @@ e1000_phy_hw_reset(struct e1000_hw *hw)
|
|
|
|
|
|
if (hw->mac_type >= e1000_82571)
|
|
if (hw->mac_type >= e1000_82571)
|
|
mdelay(10);
|
|
mdelay(10);
|
|
-
|
|
|
|
} else {
|
|
} else {
|
|
/* Read the Extended Device Control Register, assert the PHY_RESET_DIR
|
|
/* Read the Extended Device Control Register, assert the PHY_RESET_DIR
|
|
* bit to put the PHY into reset. Then, take it out of reset.
|
|
* bit to put the PHY into reset. Then, take it out of reset.
|