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

Commit 2ba6c079 authored by Todd Fujinaka's avatar Todd Fujinaka Committed by Jeff Kirsher
Browse files

igb: Fix i354 88E1112 PHY on RCC boards using AutoMediaDetect 



e1000_check_for_link_media_swap() checks PHY page 0 for copper and PHY
page 1 for "other" (fiber) link. The switch back from page 1 to page 0
happened too soon, before e1000_check_for_link_82575() is executed, and
link on fiber (other) was never detected. Check for link while still on
the proper PHY page.

Signed-off-by: default avatarTodd Fujinaka <todd.fujinaka@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 3b7884f7

drivers/net/ethernet/intel/igb/e1000_82575.c

+13 −5
Original line number Diff line number Diff line
@@ -139,10 +139,6 @@ static s32 igb_check_for_link_media_swap(struct e1000_hw *hw) 
	if (ret_val)

		return ret_val;



	/* reset page to 0 */

	ret_val = phy->ops.write_reg(hw, E1000_M88E1112_PAGE_ADDR, 0);

	if (ret_val)

		return ret_val;



	if (data & E1000_M88E1112_STATUS_LINK)

		port = E1000_MEDIA_PORT_OTHER;
@@ -151,8 +147,20 @@ static s32 igb_check_for_link_media_swap(struct e1000_hw *hw) 
	if (port && (hw->dev_spec._82575.media_port != port)) {

		hw->dev_spec._82575.media_port = port;

		hw->dev_spec._82575.media_changed = true;

	}



	if (port == E1000_MEDIA_PORT_COPPER) {

		/* reset page to 0 */

		ret_val = phy->ops.write_reg(hw, E1000_M88E1112_PAGE_ADDR, 0);

		if (ret_val)

			return ret_val;

		igb_check_for_link_82575(hw);

	} else {

		ret_val = igb_check_for_link_82575(hw);

		igb_check_for_link_82575(hw);

		/* reset page to 0 */

		ret_val = phy->ops.write_reg(hw, E1000_M88E1112_PAGE_ADDR, 0);

		if (ret_val)

			return ret_val;

	}



	return 0;