diff options
| author | Tim Harvey <tharvey@gateworks.com> | 2015-05-19 10:01:19 -0700 |
|---|---|---|
| committer | Joe Hershberger <joe.hershberger@ni.com> | 2015-08-11 13:17:02 -0500 |
| commit | 3c63dd5302a2f14c292a469b9934a8fc02b627cc (patch) | |
| tree | 1284ad3132241fcf8632e7cc9ecd46592665431a /drivers/net/e1000.c | |
| parent | 7e2d991d63f2d24d567e259c822f24aa08c85d88 (diff) | |
| download | blackbird-obmc-uboot-3c63dd5302a2f14c292a469b9934a8fc02b627cc.tar.gz blackbird-obmc-uboot-3c63dd5302a2f14c292a469b9934a8fc02b627cc.zip | |
Revert "e1000: fix sw fw sync on igb i210/i211"
This reverts commit 17da7120249bfdef877f46be5bbcb3cc01212eb9.
The i210/i211 do have the SW_FW_SYNC (0x5b5c) register and this is what should
be used when acquiring the semaphore.
I believe the issue that this patch was trying to resolve is now resolved
by properly releasing the semaphore once no longer needed.
Cc: Marcel Ziswiler <marcel@ziswiler.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Aneesh Bansal <aneesh.bansal@freescale.com>
Cc: Naveen Burmi <NaveenBurmi@freescale.com>
Cc: Po Liu <po.liu@freescale.com>
Cc: Bin Meng <bmeng.cn@gmail.com>
Cc: Alison Wang <alison.wang@freescale.com>
Cc: Reinhard Arlt <reinhard.arlt@esd-electronics.com>
Cc: Shengzhou Liu <Shengzhou.Liu@freescale.com>
Cc: York Sun <yorksun@freescale.com>
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'drivers/net/e1000.c')
| -rw-r--r-- | drivers/net/e1000.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index b49980a0ec..739d24b280 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -1120,10 +1120,7 @@ e1000_swfw_sync_acquire(struct e1000_hw *hw, uint16_t mask) if (e1000_get_hw_eeprom_semaphore(hw)) return -E1000_ERR_SWFW_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); + swfw_sync = E1000_READ_REG(hw, SW_FW_SYNC); if (!(swfw_sync & (fwmask | swmask))) break; @@ -4458,6 +4455,7 @@ e1000_phy_hw_reset(struct e1000_hw *hw) if (hw->mac_type >= e1000_82571) mdelay(10); + } else { /* Read the Extended Device Control Register, assert the PHY_RESET_DIR * bit to put the PHY into reset. Then, take it out of reset. |
