aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Fujinaka <todd.fujinaka@intel.com>2017-03-17 00:48:19 +0000
committerMister Oyster <oysterized@gmail.com>2017-07-04 12:11:08 +0200
commit7c69ee1bf2f856f0d82652d027f4a5c3e5e0b3a8 (patch)
treecd957bf6920aa558540554fe1c2aebeeb3529456
parentce40e9590985c033cb7b6ff2f426f24685320216 (diff)
igb: add i211 to i210 PHY workaround
commit 5bc8c230e2a993b49244f9457499f17283da9ec7 upstream. i210 and i211 share the same PHY but have different PCI IDs. Don't forget i211 for any i210 workarounds. Signed-off-by: Todd Fujinaka <todd.fujinaka@intel.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: Willy Tarreau <w@1wt.eu>
-rw-r--r--drivers/net/ethernet/intel/igb/e1000_phy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/igb/e1000_phy.c b/drivers/net/ethernet/intel/igb/e1000_phy.c
index 3012c09c5..583ebff31 100644
--- a/drivers/net/ethernet/intel/igb/e1000_phy.c
+++ b/drivers/net/ethernet/intel/igb/e1000_phy.c
@@ -88,7 +88,7 @@ s32 igb_get_phy_id(struct e1000_hw *hw)
u16 phy_id;
/* ensure PHY page selection to fix misconfigured i210 */
- if (hw->mac.type == e1000_i210)
+ if ((hw->mac.type == e1000_i210) || (hw->mac.type == e1000_i211))
phy->ops.write_reg(hw, I347AT4_PAGE_SELECT, 0);
ret_val = phy->ops.read_reg(hw, PHY_ID1, &phy_id);