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

Commit 230bb0f3 authored by Yuval Mintz's avatar Yuval Mintz Committed by David S. Miller
Browse files

bnx2x: (semantic) revise scheduling of sp_rtnl 



This removes the various points where the driver use bit operations in order
to schedule the sp_rtnl_task from the code, adding a single utility function
that does it instead.

Signed-off-by: default avatarYuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: default avatarAriel Elior <ariele@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0155a27c

drivers/net/ethernet/broadcom/bnx2x/bnx2x.h

+1 −1
Original line number Diff line number Diff line
@@ -1402,7 +1402,7 @@ struct bnx2x_fw_stats_data { 
};



/* Public slow path states */

enum {

enum sp_rtnl_flag {

	BNX2X_SP_RTNL_SETUP_TC,

	BNX2X_SP_RTNL_TX_TIMEOUT,

	BNX2X_SP_RTNL_FAN_FAILURE,

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

+13 −5
Original line number Diff line number Diff line
@@ -4773,12 +4773,8 @@ void bnx2x_tx_timeout(struct net_device *dev) 
		bnx2x_panic();

#endif



	smp_mb__before_clear_bit();

	set_bit(BNX2X_SP_RTNL_TX_TIMEOUT, &bp->sp_rtnl_state);

	smp_mb__after_clear_bit();



	/* This allows the netif to be shutdown gracefully before resetting */

	schedule_delayed_work(&bp->sp_rtnl_task, 0);

	bnx2x_schedule_sp_rtnl(bp, BNX2X_SP_RTNL_TX_TIMEOUT, 0);

}



int bnx2x_suspend(struct pci_dev *pdev, pm_message_t state)
@@ -4906,3 +4902,15 @@ void bnx2x_update_coalesce_sb_index(struct bnx2x *bp, u8 fw_sb_id, 
	disable = disable ? 1 : (usec ? 0 : 1);

	storm_memset_hc_disable(bp, port, fw_sb_id, sb_index, disable);

}



void bnx2x_schedule_sp_rtnl(struct bnx2x *bp, enum sp_rtnl_flag flag,

			    u32 verbose)

{

	smp_mb__before_clear_bit();

	set_bit(flag, &bp->sp_rtnl_state);

	smp_mb__after_clear_bit();

	DP((BNX2X_MSG_SP | verbose), "Scheduling sp_rtnl task [Flag: %d]\n",

	   flag);

	schedule_delayed_work(&bp->sp_rtnl_task, 0);

}

EXPORT_SYMBOL(bnx2x_schedule_sp_rtnl);

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h

+3 −0
Original line number Diff line number Diff line
@@ -1324,4 +1324,7 @@ void bnx2x_fill_fw_str(struct bnx2x *bp, char *buf, size_t buf_len); 
int bnx2x_drain_tx_queues(struct bnx2x *bp);

void bnx2x_squeeze_objects(struct bnx2x *bp);



void bnx2x_schedule_sp_rtnl(struct bnx2x*, enum sp_rtnl_flag,

			    u32 verbose);



#endif /* BNX2X_CMN_H */

drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c

+2 −6
Original line number Diff line number Diff line
@@ -710,8 +710,7 @@ static inline void bnx2x_dcbx_update_tc_mapping(struct bnx2x *bp) 
	 * as we are handling an attention on a work queue which must be

	 * flushed at some rtnl-locked contexts (e.g. if down)

	 */

	if (!test_and_set_bit(BNX2X_SP_RTNL_SETUP_TC, &bp->sp_rtnl_state))

		schedule_delayed_work(&bp->sp_rtnl_task, 0);

	bnx2x_schedule_sp_rtnl(bp, BNX2X_SP_RTNL_SETUP_TC, 0);

}



void bnx2x_dcbx_set_params(struct bnx2x *bp, u32 state)
@@ -764,10 +763,7 @@ void bnx2x_dcbx_set_params(struct bnx2x *bp, u32 state) 
			if (IS_MF(bp))

				bnx2x_link_sync_notify(bp);



			set_bit(BNX2X_SP_RTNL_TX_STOP, &bp->sp_rtnl_state);



			schedule_delayed_work(&bp->sp_rtnl_task, 0);



			bnx2x_schedule_sp_rtnl(bp, BNX2X_SP_RTNL_TX_STOP, 0);

			return;

		}

	case BNX2X_DCBX_STATE_TX_PAUSED:

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+8 −20
Original line number Diff line number Diff line
@@ -3908,10 +3908,7 @@ static void bnx2x_fan_failure(struct bnx2x *bp) 
	 * This is due to some boards consuming sufficient power when driver is

	 * up to overheat if fan fails.

	 */

	smp_mb__before_clear_bit();

	set_bit(BNX2X_SP_RTNL_FAN_FAILURE, &bp->sp_rtnl_state);

	smp_mb__after_clear_bit();

	schedule_delayed_work(&bp->sp_rtnl_task, 0);

	bnx2x_schedule_sp_rtnl(bp, BNX2X_SP_RTNL_FAN_FAILURE, 0);

}



static void bnx2x_attn_int_deasserted0(struct bnx2x *bp, u32 attn)
@@ -5303,6 +5300,8 @@ static void bnx2x_eq_int(struct bnx2x *bp) 
					break;



			} else {

				int cmd = BNX2X_SP_RTNL_AFEX_F_UPDATE;



				DP(BNX2X_MSG_SP | BNX2X_MSG_MCP,

				   "AFEX: ramrod completed FUNCTION_UPDATE\n");

				f_obj->complete_cmd(bp, f_obj,
@@ -5312,12 +5311,7 @@ static void bnx2x_eq_int(struct bnx2x *bp) 
				 * sp_rtnl task as all Queue SP operations

				 * should run under rtnl_lock.

				 */

				smp_mb__before_clear_bit();

				set_bit(BNX2X_SP_RTNL_AFEX_F_UPDATE,

					&bp->sp_rtnl_state);

				smp_mb__after_clear_bit();



				schedule_delayed_work(&bp->sp_rtnl_task, 0);

				bnx2x_schedule_sp_rtnl(bp, cmd, 0);

			}



			goto next_spqe;
@@ -12082,11 +12076,8 @@ static void bnx2x_set_rx_mode(struct net_device *dev) 
		return;

	} else {

		/* Schedule an SP task to handle rest of change */

		DP(NETIF_MSG_IFUP, "Scheduling an Rx mode change\n");

		smp_mb__before_clear_bit();

		set_bit(BNX2X_SP_RTNL_RX_MODE, &bp->sp_rtnl_state);

		smp_mb__after_clear_bit();

		schedule_delayed_work(&bp->sp_rtnl_task, 0);

		bnx2x_schedule_sp_rtnl(bp, BNX2X_SP_RTNL_RX_MODE,

				       NETIF_MSG_IFUP);

	}

}
@@ -12119,11 +12110,8 @@ void bnx2x_set_rx_mode_inner(struct bnx2x *bp) 
			/* configuring mcast to a vf involves sleeping (when we

			 * wait for the pf's response).

			 */

			smp_mb__before_clear_bit();

			set_bit(BNX2X_SP_RTNL_VFPF_MCAST,

				&bp->sp_rtnl_state);

			smp_mb__after_clear_bit();

			schedule_delayed_work(&bp->sp_rtnl_task, 0);

			bnx2x_schedule_sp_rtnl(bp,

					       BNX2X_SP_RTNL_VFPF_MCAST, 0);

		}

	}