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

Commit 0605c45c authored by Jacob Keller's avatar Jacob Keller Committed by Jeff Kirsher
Browse files

i40e: move I40E_FLAG_TEMP_LINK_POLLING to state field 



This flag is modified outside of the RTNL lock and thus should not be
part of the pf->flags variable.

Use a state bit instead, so that we can use atomic bit operations.

This is part of a larger effort to remove cmpxchg64 in
i40e_set_priv_flags()

Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 134201ae

drivers/net/ethernet/intel/i40e/i40e.h

+2 −1
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ enum i40e_state_t { 
	__I40E_VF_DISABLE,

	__I40E_MACVLAN_SYNC_PENDING,

	__I40E_UDP_FILTER_SYNC_PENDING,

	__I40E_TEMP_LINK_POLLING,

	/* This must be last as it determines the size of the BITMAP */

	__I40E_STATE_SIZE__,

};
@@ -534,7 +535,7 @@ struct i40e_pf { 
#define I40E_FLAG_VEB_STATS_ENABLED		BIT_ULL(17)

#define I40E_FLAG_LINK_POLLING_ENABLED		BIT_ULL(18)

#define I40E_FLAG_TRUE_PROMISC_SUPPORT		BIT_ULL(19)

#define I40E_FLAG_TEMP_LINK_POLLING		BIT_ULL(20)

/* Gap for BIT_ULL(20) */

#define I40E_FLAG_LEGACY_RX			BIT_ULL(21)

#define I40E_FLAG_PTP				BIT_ULL(22)

#define I40E_FLAG_IWARP_ENABLED			BIT_ULL(23)

drivers/net/ethernet/intel/i40e/i40e_main.c

+3 −4
Original line number Diff line number Diff line
@@ -8432,13 +8432,12 @@ static void i40e_link_event(struct i40e_pf *pf) 


	/* On success, disable temp link polling */

	if (status == I40E_SUCCESS) {

		if (pf->flags & I40E_FLAG_TEMP_LINK_POLLING)

			pf->flags &= ~I40E_FLAG_TEMP_LINK_POLLING;

		clear_bit(__I40E_TEMP_LINK_POLLING, pf->state);

	} else {

		/* Enable link polling temporarily until i40e_get_link_status

		 * returns I40E_SUCCESS

		 */

		pf->flags |= I40E_FLAG_TEMP_LINK_POLLING;

		set_bit(__I40E_TEMP_LINK_POLLING, pf->state);

		dev_dbg(&pf->pdev->dev, "couldn't get link state, status: %d\n",

			status);

		return;
@@ -8490,7 +8489,7 @@ static void i40e_watchdog_subtask(struct i40e_pf *pf) 
	pf->service_timer_previous = jiffies;



	if ((pf->flags & I40E_FLAG_LINK_POLLING_ENABLED) ||

	    (pf->flags & I40E_FLAG_TEMP_LINK_POLLING))

	    test_bit(__I40E_TEMP_LINK_POLLING, pf->state))

		i40e_link_event(pf);



	/* Update the stats for active netdevs so the network stack