xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i40e/i40evf: use DECLARE_BITMAP for state

Browse Source 
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: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Jesse Brandeburg
2017-08-29 05:32:35 -04:00
committed by Jeff Kirsher
parent 0a0d9af5bc
commit bd6cd4e6dd
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/intel/i40e/i40e_debugfs.c
View File

@@ -278,8 +278,8 @@ static void i40e_dbg_dump_vsi_seid(struct i40e_pf *pf, int seid)
rx_ring->netdev, rx_ring->netdev,
rx_ring->rx_bi); rx_ring->rx_bi);
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
" rx_rings[%i]: state = %li, queue_index = %d, reg_idx = %d\n", " rx_rings[%i]: state = %lu, queue_index = %d, reg_idx = %d\n",
i, rx_ring->state, i, *rx_ring->state,
rx_ring->queue_index, rx_ring->queue_index,
rx_ring->reg_idx); rx_ring->reg_idx);
dev_info(&pf->pdev->dev, 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->netdev,
tx_ring->tx_bi); tx_ring->tx_bi);
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
" tx_rings[%i]: state = %li, queue_index = %d, reg_idx = %d\n", " tx_rings[%i]: state = %lu, queue_index = %d, reg_idx = %d\n",
i, tx_ring->state, i, *tx_ring->state,
tx_ring->queue_index, tx_ring->queue_index,
tx_ring->reg_idx); tx_ring->reg_idx);
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,

4
drivers/net/ethernet/intel/i40e/i40e_main.c
View File

@@ -2891,7 +2891,7 @@ static void i40e_config_xps_tx_ring(struct i40e_ring *ring)
return; return;
if ((vsi->tc_config.numtc <= 1) && 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); cpu = cpumask_local_spread(ring->q_vector->v_idx, -1);
netif_set_xps_queue(ring->netdev, get_cpu_mask(cpu), netif_set_xps_queue(ring->netdev, get_cpu_mask(cpu),
ring->queue_index); ring->queue_index);
@@ -3010,7 +3010,7 @@ static int i40e_configure_rx_ring(struct i40e_ring *ring)
struct i40e_hmc_obj_rxq rx_ctx; struct i40e_hmc_obj_rxq rx_ctx;
i40e_status err = 0; i40e_status err = 0;
ring->state = 0; bitmap_zero(ring->state, __I40E_RING_STATE_NBITS);
/* clear the context structure first */ /* clear the context structure first */
memset(&rx_ctx, 0, sizeof(rx_ctx)); memset(&rx_ctx, 0, sizeof(rx_ctx));

3
drivers/net/ethernet/intel/i40e/i40e_txrx.h
View File

@@ -342,6 +342,7 @@ struct i40e_rx_queue_stats {
enum i40e_ring_state_t { enum i40e_ring_state_t {
__I40E_TX_FDIR_INIT_DONE, __I40E_TX_FDIR_INIT_DONE,
__I40E_TX_XPS_INIT_DONE, __I40E_TX_XPS_INIT_DONE,
__I40E_RING_STATE_NBITS /* must be last */
}; };
/* some useful defines for virtchannel interface, which /* some useful defines for virtchannel interface, which
@@ -366,7 +367,7 @@ struct i40e_ring {
struct i40e_tx_buffer *tx_bi; struct i40e_tx_buffer *tx_bi;
struct i40e_rx_buffer *rx_bi; struct i40e_rx_buffer *rx_bi;
}; };
unsigned long state; DECLARE_BITMAP(state, __I40E_RING_STATE_NBITS);
u16 queue_index; /* Queue number of ring */ u16 queue_index; /* Queue number of ring */
u8 dcb_tc; /* Traffic class of ring */ u8 dcb_tc; /* Traffic class of ring */
u8 __iomem *tail; u8 __iomem *tail;

3
drivers/net/ethernet/intel/i40evf/i40e_txrx.h
View File

@@ -325,6 +325,7 @@ struct i40e_rx_queue_stats {
enum i40e_ring_state_t { enum i40e_ring_state_t {
__I40E_TX_FDIR_INIT_DONE, __I40E_TX_FDIR_INIT_DONE,
__I40E_TX_XPS_INIT_DONE, __I40E_TX_XPS_INIT_DONE,
__I40E_RING_STATE_NBITS /* must be last */
}; };
/* some useful defines for virtchannel interface, which /* some useful defines for virtchannel interface, which
@@ -348,7 +349,7 @@ struct i40e_ring {
struct i40e_tx_buffer *tx_bi; struct i40e_tx_buffer *tx_bi;
struct i40e_rx_buffer *rx_bi; struct i40e_rx_buffer *rx_bi;
}; };
unsigned long state; DECLARE_BITMAP(state, __I40E_RING_STATE_NBITS);
u16 queue_index; /* Queue number of ring */ u16 queue_index; /* Queue number of ring */
u8 dcb_tc; /* Traffic class of ring */ u8 dcb_tc; /* Traffic class of ring */
u8 __iomem *tail; u8 __iomem *tail;