]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
igb: add i211 to i210 PHY workaround
authorTodd Fujinaka <todd.fujinaka@intel.com>
Mon, 28 Nov 2016 17:09:57 +0000 (09:09 -0800)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Fri, 6 Jan 2017 10:23:01 +0000 (02:23 -0800)
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>
drivers/net/ethernet/intel/igb/e1000_phy.c

index 569ee25642b459ec9665aac90d8573c24b04e81a..2788a5409023ef41ad9ba62620acbc398b96d490 100644 (file)
@@ -78,7 +78,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);