diff options
| author | Todd Fujinaka <todd.fujinaka@intel.com> | 2017-03-16 20:48:19 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-22 07:43:35 -0400 |
| commit | 61229e62c1aa4d397aab9949325cab49acfd7dab (patch) | |
| tree | 3e9382e5dd59fcd78ae13a8322c5ee4f457de24c /drivers/net/ethernet/intel/igb | |
| parent | 15ffc931eeb94d9673c2a163828704a7cf4c1df5 (diff) | |
igb: add i211 to i210 PHY workaround
[ Upstream commit 5bc8c230e2a993b49244f9457499f17283da9ec7 ]
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: 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 | 2 |
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 569ee25642b4..2788a5409023 100644 --- a/drivers/net/ethernet/intel/igb/e1000_phy.c +++ b/drivers/net/ethernet/intel/igb/e1000_phy.c | |||
| @@ -78,7 +78,7 @@ s32 igb_get_phy_id(struct e1000_hw *hw) | |||
| 78 | u16 phy_id; | 78 | u16 phy_id; |
| 79 | 79 | ||
| 80 | /* ensure PHY page selection to fix misconfigured i210 */ | 80 | /* ensure PHY page selection to fix misconfigured i210 */ |
| 81 | if (hw->mac.type == e1000_i210) | 81 | if ((hw->mac.type == e1000_i210) || (hw->mac.type == e1000_i211)) |
| 82 | phy->ops.write_reg(hw, I347AT4_PAGE_SELECT, 0); | 82 | phy->ops.write_reg(hw, I347AT4_PAGE_SELECT, 0); |
| 83 | 83 | ||
| 84 | ret_val = phy->ops.read_reg(hw, PHY_ID1, &phy_id); | 84 | ret_val = phy->ops.read_reg(hw, PHY_ID1, &phy_id); |