lkml.org 
[lkml]   [2017]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 059/142] igb: add i211 to i210 PHY workaround
    Date
    From: Todd Fujinaka <todd.fujinaka@intel.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    [ 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: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/net/ethernet/intel/igb/e1000_phy.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/intel/igb/e1000_phy.c b/drivers/net/ethernet/intel/igb/e1000_phy.c
    index bd91752760d0..44274022a73b 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);
    --
    2.12.2
    \
     
     \ /
      Last update: 2017-04-10 17:57    [W:4.108 / U:0.980 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site