diff options
author | Chris J Arges <christopherarges@gmail.com> | 2017-03-16 20:48:19 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-22 07:43:35 -0400 |
commit | 15ffc931eeb94d9673c2a163828704a7cf4c1df5 (patch) | |
tree | 1710590919ca3069603cfb03b89be1923697010a /drivers/net/ethernet/intel/igb | |
parent | 4b40611a9b7e5d06626674af898608167ac3f727 (diff) |
igb: Workaround for igb i210 firmware issue
[ Upstream commit 4e684f59d760a2c7c716bb60190783546e2d08a1 ]
Sometimes firmware may not properly initialize I347AT4_PAGE_SELECT causing
the probe of an igb i210 NIC to fail. This patch adds an addition zeroing
of this register during igb_get_phy_id to workaround this issue.
Thanks for Jochen Henneberg for the idea and original patch.
Signed-off-by: Chris J Arges <christopherarges@gmail.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/intel/igb')
-rw-r--r-- | drivers/net/ethernet/intel/igb/e1000_phy.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/igb/e1000_phy.c b/drivers/net/ethernet/intel/igb/e1000_phy.c index 5b54254aed4f..569ee25642b4 100644 --- a/drivers/net/ethernet/intel/igb/e1000_phy.c +++ b/drivers/net/ethernet/intel/igb/e1000_phy.c | |||
@@ -77,6 +77,10 @@ s32 igb_get_phy_id(struct e1000_hw *hw) | |||
77 | s32 ret_val = 0; | 77 | s32 ret_val = 0; |
78 | u16 phy_id; | 78 | u16 phy_id; |
79 | 79 | ||
80 | /* ensure PHY page selection to fix misconfigured i210 */ | ||
81 | if (hw->mac.type == e1000_i210) | ||
82 | phy->ops.write_reg(hw, I347AT4_PAGE_SELECT, 0); | ||
83 | |||
80 | ret_val = phy->ops.read_reg(hw, PHY_ID1, &phy_id); | 84 | ret_val = phy->ops.read_reg(hw, PHY_ID1, &phy_id); |
81 | if (ret_val) | 85 | if (ret_val) |
82 | goto out; | 86 | goto out; |