Commit ede3ef0d authored by Nick Nunley's avatar Nick Nunley Committed by David S. Miller
Browse files

igb: fix PHY config access on 82580 



82580 NICs can have up to 4 functions. This fixes phy accesses
to use the correct locks for functions 2 and 3.

Signed-off-by: default avatarNicholas Nunley <nicholasx.d.nunley@intel.com>
Tested-by: default avatarJeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 74752710

drivers/net/igb/e1000_82575.c

+8 −0
Original line number Diff line number Diff line
@@ -295,6 +295,10 @@ static s32 igb_acquire_phy_82575(struct e1000_hw *hw) 


	if (hw->bus.func == E1000_FUNC_1)

		mask = E1000_SWFW_PHY1_SM;

	else if (hw->bus.func == E1000_FUNC_2)

		mask = E1000_SWFW_PHY2_SM;

	else if (hw->bus.func == E1000_FUNC_3)

		mask = E1000_SWFW_PHY3_SM;



	return igb_acquire_swfw_sync_82575(hw, mask);

}
@@ -312,6 +316,10 @@ static void igb_release_phy_82575(struct e1000_hw *hw) 


	if (hw->bus.func == E1000_FUNC_1)

		mask = E1000_SWFW_PHY1_SM;

	else if (hw->bus.func == E1000_FUNC_2)

		mask = E1000_SWFW_PHY2_SM;

	else if (hw->bus.func == E1000_FUNC_3)

		mask = E1000_SWFW_PHY3_SM;



	igb_release_swfw_sync_82575(hw, mask);

}

drivers/net/igb/e1000_defines.h

+2 −0
Original line number Diff line number Diff line
@@ -164,6 +164,8 @@ 
#define E1000_SWFW_EEP_SM   0x1

#define E1000_SWFW_PHY0_SM  0x2

#define E1000_SWFW_PHY1_SM  0x4

#define E1000_SWFW_PHY2_SM  0x20

#define E1000_SWFW_PHY3_SM  0x40



/* FACTPS Definitions */

/* Device Control */

CRA Git | Maintained and supported by SUSTech CRA and CCSE