Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5dcaba7e authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net 



Jeff Kirsher says:

====================
This series contains fixes to e1000e.
 ...
Bruce Allan (1):
  e1000e: fix test for PHY being accessible on 82577/8/9 and I217

Tushar Dave (1):
  e1000e: Correct link check logic for 82571 serdes
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 96f80d12 a52359b5

drivers/net/ethernet/intel/e1000e/82571.c

+3 −0
Original line number Diff line number Diff line
@@ -1572,6 +1572,9 @@ static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw) 
	ctrl = er32(CTRL);

	status = er32(STATUS);

	rxcw = er32(RXCW);

	/* SYNCH bit and IV bit are sticky */

	udelay(10);

	rxcw = er32(RXCW);



	if ((rxcw & E1000_RXCW_SYNCH) && !(rxcw & E1000_RXCW_IV)) {

drivers/net/ethernet/intel/e1000e/ich8lan.c

+32 −10
Original line number Diff line number Diff line
@@ -325,24 +325,46 @@ static inline void __ew32flash(struct e1000_hw *hw, unsigned long reg, u32 val) 
 **/

static bool e1000_phy_is_accessible_pchlan(struct e1000_hw *hw)

{

	u16 phy_reg;

	u32 phy_id;

	u16 phy_reg = 0;

	u32 phy_id = 0;

	s32 ret_val;

	u16 retry_count;



	e1e_rphy_locked(hw, PHY_ID1, &phy_reg);

	for (retry_count = 0; retry_count < 2; retry_count++) {

		ret_val = e1e_rphy_locked(hw, PHY_ID1, &phy_reg);

		if (ret_val || (phy_reg == 0xFFFF))

			continue;

		phy_id = (u32)(phy_reg << 16);

	e1e_rphy_locked(hw, PHY_ID2, &phy_reg);



		ret_val = e1e_rphy_locked(hw, PHY_ID2, &phy_reg);

		if (ret_val || (phy_reg == 0xFFFF)) {

			phy_id = 0;

			continue;

		}

		phy_id |= (u32)(phy_reg & PHY_REVISION_MASK);

		break;

	}



	if (hw->phy.id) {

		if (hw->phy.id == phy_id)

			return true;

	} else {

		if ((phy_id != 0) && (phy_id != PHY_REVISION_MASK))

	} else if (phy_id) {

		hw->phy.id = phy_id;

		hw->phy.revision = (u32)(phy_reg & ~PHY_REVISION_MASK);

		return true;

	}



	return false;

	/*

	 * In case the PHY needs to be in mdio slow mode,

	 * set slow mode and try to get the PHY id again.

	 */

	hw->phy.ops.release(hw);

	ret_val = e1000_set_mdio_slow_mode_hv(hw);

	if (!ret_val)

		ret_val = e1000e_get_phy_id(hw);

	hw->phy.ops.acquire(hw);



	return !ret_val;

}



/**