diff options
| author |   Carolyn Wyborny <carolyn.wyborny@intel.com> | 2013-09-10 11:57:16 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-09-12 16:24:55 -0400 |
| commit | bb1d18d1ad6e216535b994d68097ae107f4f35fb (patch) | |
| tree | 0817322c3bbba587ebc92cd9397b3398c0c049c3 /drivers/net/ethernet/intel/igb | |
| parent | Merge tag 'master-2013-09-09' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless (diff) | |
| download | linux-dev-bb1d18d1ad6e216535b994d68097ae107f4f35fb.tar.xz linux-dev-bb1d18d1ad6e216535b994d68097ae107f4f35fb.zip | |
igb: Add additional get_phy_id call for i354 devices
This patch fixes a problem where some ports can fail to initialize on a
cold boot. This patch adds an additional call to read the PHY id for i354
devices in order workaround the hardware problem.
Signed-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/igb')
| -rw-r--r-- | drivers/net/ethernet/intel/igb/e1000_82575.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.c b/drivers/net/ethernet/intel/igb/e1000_82575.c index 79b58353d849..47c2d10df826 100644 --- a/drivers/net/ethernet/intel/igb/e1000_82575.c +++ b/drivers/net/ethernet/intel/igb/e1000_82575.c @@ -719,6 +719,10 @@ static s32 igb_get_phy_id_82575(struct e1000_hw *hw) u32 ctrl_ext; u32 mdic; + /* Extra read required for some PHY's on i354 */ + if (hw->mac.type == e1000_i354) + igb_get_phy_id(hw); + /* For SGMII PHYs, we try the list of possible addresses until * we find one that works. For non-SGMII PHYs * (e.g. integrated copper PHYs), an address of 1 should |