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

Commit bd6cd4e6 authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Kirsher
Browse files

i40e/i40evf: use DECLARE_BITMAP for state 



When using set_bit and friends, we should be using actual
bitmaps, and fix all the locations where we might access
it.

Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 0a0d9af5

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

+4 −4
Original line number Diff line number Diff line
@@ -278,8 +278,8 @@ static void i40e_dbg_dump_vsi_seid(struct i40e_pf *pf, int seid) 
			 rx_ring->netdev,

			 rx_ring->rx_bi);

		dev_info(&pf->pdev->dev,

			 "    rx_rings[%i]: state = %li, queue_index = %d, reg_idx = %d\n",

			 i, rx_ring->state,

			 "    rx_rings[%i]: state = %lu, queue_index = %d, reg_idx = %d\n",

			 i, *rx_ring->state,

			 rx_ring->queue_index,

			 rx_ring->reg_idx);

		dev_info(&pf->pdev->dev,
@@ -334,8 +334,8 @@ static void i40e_dbg_dump_vsi_seid(struct i40e_pf *pf, int seid) 
			 tx_ring->netdev,

			 tx_ring->tx_bi);

		dev_info(&pf->pdev->dev,

			 "    tx_rings[%i]: state = %li, queue_index = %d, reg_idx = %d\n",

			 i, tx_ring->state,

			 "    tx_rings[%i]: state = %lu, queue_index = %d, reg_idx = %d\n",

			 i, *tx_ring->state,

			 tx_ring->queue_index,

			 tx_ring->reg_idx);

		dev_info(&pf->pdev->dev,

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

+2 −2
Original line number Diff line number Diff line
@@ -2891,7 +2891,7 @@ static void i40e_config_xps_tx_ring(struct i40e_ring *ring) 
		return;



	if ((vsi->tc_config.numtc <= 1) &&

	    !test_and_set_bit(__I40E_TX_XPS_INIT_DONE, &ring->state)) {

	    !test_and_set_bit(__I40E_TX_XPS_INIT_DONE, ring->state)) {

		cpu = cpumask_local_spread(ring->q_vector->v_idx, -1);

		netif_set_xps_queue(ring->netdev, get_cpu_mask(cpu),

				    ring->queue_index);
@@ -3010,7 +3010,7 @@ static int i40e_configure_rx_ring(struct i40e_ring *ring) 
	struct i40e_hmc_obj_rxq rx_ctx;

	i40e_status err = 0;



	ring->state = 0;

	bitmap_zero(ring->state, __I40E_RING_STATE_NBITS);



	/* clear the context structure first */

	memset(&rx_ctx, 0, sizeof(rx_ctx));

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

+2 −1
Original line number Diff line number Diff line
@@ -342,6 +342,7 @@ struct i40e_rx_queue_stats { 
enum i40e_ring_state_t {

	__I40E_TX_FDIR_INIT_DONE,

	__I40E_TX_XPS_INIT_DONE,

	__I40E_RING_STATE_NBITS /* must be last */

};



/* some useful defines for virtchannel interface, which
@@ -366,7 +367,7 @@ struct i40e_ring { 
		struct i40e_tx_buffer *tx_bi;

		struct i40e_rx_buffer *rx_bi;

	};

	unsigned long state;

	DECLARE_BITMAP(state, __I40E_RING_STATE_NBITS);

	u16 queue_index;		/* Queue number of ring */

	u8 dcb_tc;			/* Traffic class of ring */

	u8 __iomem *tail;

drivers/net/ethernet/intel/i40evf/i40e_txrx.h

+2 −1
Original line number Diff line number Diff line
@@ -325,6 +325,7 @@ struct i40e_rx_queue_stats { 
enum i40e_ring_state_t {

	__I40E_TX_FDIR_INIT_DONE,

	__I40E_TX_XPS_INIT_DONE,

	__I40E_RING_STATE_NBITS /* must be last */

};



/* some useful defines for virtchannel interface, which
@@ -348,7 +349,7 @@ struct i40e_ring { 
		struct i40e_tx_buffer *tx_bi;

		struct i40e_rx_buffer *rx_bi;

	};

	unsigned long state;

	DECLARE_BITMAP(state, __I40E_RING_STATE_NBITS);

	u16 queue_index;		/* Queue number of ring */

	u8 dcb_tc;			/* Traffic class of ring */

	u8 __iomem *tail;