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

Commit 5e655105 authored by Don Skidmore's avatar Don Skidmore Committed by Jeff Kirsher
Browse files

ixgbe: add function pointer for semaphore function 



The X540 devices grabs semaphores differently than 82599 and 82598
devices do.  They do however also grab them in allot of the same
functions.  So I'm adding a new MAC operation function pointer to
allow us to use the correct function based on our MAC type.  I'm also
changing all the semaphore calls to use this new function pointer.

Signed-off-by: default avatarDon Skidmore <donald.c.skidmore@intel.com>
Tested-by: default avatarStephen Ko <stephen.s.ko@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 93cb38dc

drivers/net/ixgbe/ixgbe_82598.c

+2 −0
Original line number Diff line number Diff line
@@ -1201,6 +1201,8 @@ static struct ixgbe_mac_operations mac_ops_82598 = { 
	.clear_vfta		= &ixgbe_clear_vfta_82598,

	.set_vfta		= &ixgbe_set_vfta_82598,

	.fc_enable		= &ixgbe_fc_enable_82598,

	.acquire_swfw_sync      = &ixgbe_acquire_swfw_sync,

	.release_swfw_sync      = &ixgbe_release_swfw_sync,

};



static struct ixgbe_eeprom_operations eeprom_ops_82598 = {

drivers/net/ixgbe/ixgbe_82599.c

+5 −1
Original line number Diff line number Diff line
@@ -112,7 +112,8 @@ static s32 ixgbe_setup_sfp_modules_82599(struct ixgbe_hw *hw) 
			goto setup_sfp_out;



		/* PHY config will finish before releasing the semaphore */

		ret_val = ixgbe_acquire_swfw_sync(hw, IXGBE_GSSR_MAC_CSR_SM);

		ret_val = hw->mac.ops.acquire_swfw_sync(hw,

		                                        IXGBE_GSSR_MAC_CSR_SM);

		if (ret_val != 0) {

			ret_val = IXGBE_ERR_SWFW_SYNC;

			goto setup_sfp_out;
@@ -2044,6 +2045,9 @@ static struct ixgbe_mac_operations mac_ops_82599 = { 
	.setup_sfp              = &ixgbe_setup_sfp_modules_82599,

	.set_mac_anti_spoofing  = &ixgbe_set_mac_anti_spoofing,

	.set_vlan_anti_spoofing = &ixgbe_set_vlan_anti_spoofing,

	.acquire_swfw_sync      = &ixgbe_acquire_swfw_sync,

	.release_swfw_sync      = &ixgbe_release_swfw_sync,



};



static struct ixgbe_eeprom_operations eeprom_ops_82599 = {

drivers/net/ixgbe/ixgbe_common.c

+2 −2
Original line number Diff line number Diff line
@@ -745,7 +745,7 @@ static s32 ixgbe_acquire_eeprom(struct ixgbe_hw *hw) 
	u32 eec;

	u32 i;



	if (ixgbe_acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM) != 0)

	if (hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM) != 0)

		status = IXGBE_ERR_SWFW_SYNC;



	if (status == 0) {
@@ -768,7 +768,7 @@ static s32 ixgbe_acquire_eeprom(struct ixgbe_hw *hw) 
			IXGBE_WRITE_REG(hw, IXGBE_EEC, eec);

			hw_dbg(hw, "Could not acquire EEPROM grant\n");



			ixgbe_release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);

			hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);

			status = IXGBE_ERR_EEPROM;

		}

drivers/net/ixgbe/ixgbe_phy.c

+4 −4
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ s32 ixgbe_read_phy_reg_generic(struct ixgbe_hw *hw, u32 reg_addr, 
	else

		gssr = IXGBE_GSSR_PHY0_SM;



	if (ixgbe_acquire_swfw_sync(hw, gssr) != 0)

	if (hw->mac.ops.acquire_swfw_sync(hw, gssr) != 0)

		status = IXGBE_ERR_SWFW_SYNC;



	if (status == 0) {
@@ -277,7 +277,7 @@ s32 ixgbe_read_phy_reg_generic(struct ixgbe_hw *hw, u32 reg_addr, 
			}

		}



		ixgbe_release_swfw_sync(hw, gssr);

		hw->mac.ops.release_swfw_sync(hw, gssr);

	}



	return status;
@@ -303,7 +303,7 @@ s32 ixgbe_write_phy_reg_generic(struct ixgbe_hw *hw, u32 reg_addr, 
	else

		gssr = IXGBE_GSSR_PHY0_SM;



	if (ixgbe_acquire_swfw_sync(hw, gssr) != 0)

	if (hw->mac.ops.acquire_swfw_sync(hw, gssr) != 0)

		status = IXGBE_ERR_SWFW_SYNC;



	if (status == 0) {
@@ -370,7 +370,7 @@ s32 ixgbe_write_phy_reg_generic(struct ixgbe_hw *hw, u32 reg_addr, 
			}

		}



		ixgbe_release_swfw_sync(hw, gssr);

		hw->mac.ops.release_swfw_sync(hw, gssr);

	}



	return status;

drivers/net/ixgbe/ixgbe_type.h

+2 −0
Original line number Diff line number Diff line
@@ -2495,6 +2495,8 @@ struct ixgbe_mac_operations { 
	s32 (*write_analog_reg8)(struct ixgbe_hw*, u32, u8);

	s32 (*setup_sfp)(struct ixgbe_hw *);

	s32 (*enable_rx_dma)(struct ixgbe_hw *, u32);

	s32 (*acquire_swfw_sync)(struct ixgbe_hw *, u16);

	void (*release_swfw_sync)(struct ixgbe_hw *, u16);



	/* Link */

	void (*disable_tx_laser)(struct ixgbe_hw *);