AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

i40e/i40evf: set AQ count after memory allocation

Browse Source 
The standard way to check if the AQ is enabled is to look at the
count field. So we should only set this field after we have
successfully allocated memory. To do otherwise is to incite
panic among the populace.

Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Mitch Williams 2015-10-03 17:13:05 -07:00 committed by David S. Miller
parent 855591d2f7
commit 90d2c056bd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -386,7 +386,6 @@ static i40e_status i40e_init_asq(struct i40e_hw *hw)
hw->aq.asq.next_to_use = 0; hw->aq.asq.next_to_use = 0;
hw->aq.asq.next_to_clean = 0; hw->aq.asq.next_to_clean = 0;
hw->aq.asq.count = hw->aq.num_asq_entries;
/* allocate the ring memory */ /* allocate the ring memory */
ret_code = i40e_alloc_adminq_asq_ring(hw); ret_code = i40e_alloc_adminq_asq_ring(hw);
@ -404,6 +403,7 @@ static i40e_status i40e_init_asq(struct i40e_hw *hw)
goto init_adminq_free_rings; goto init_adminq_free_rings;
/* success! */ /* success! */
hw->aq.asq.count = hw->aq.num_asq_entries;
goto init_adminq_exit; goto init_adminq_exit;
init_adminq_free_rings: init_adminq_free_rings:
@ -445,7 +445,6 @@ static i40e_status i40e_init_arq(struct i40e_hw *hw)
hw->aq.arq.next_to_use = 0; hw->aq.arq.next_to_use = 0;
hw->aq.arq.next_to_clean = 0; hw->aq.arq.next_to_clean = 0;
hw->aq.arq.count = hw->aq.num_arq_entries;
/* allocate the ring memory */ /* allocate the ring memory */
ret_code = i40e_alloc_adminq_arq_ring(hw); ret_code = i40e_alloc_adminq_arq_ring(hw);
@ -463,6 +462,7 @@ static i40e_status i40e_init_arq(struct i40e_hw *hw)
goto init_adminq_free_rings; goto init_adminq_free_rings;
/* success! */ /* success! */
hw->aq.arq.count = hw->aq.num_arq_entries;
goto init_adminq_exit; goto init_adminq_exit;
init_adminq_free_rings: init_adminq_free_rings:

4
drivers/net/ethernet/intel/i40evf/i40e_adminq.c
View File

@ -373,7 +373,6 @@ static i40e_status i40e_init_asq(struct i40e_hw *hw)
hw->aq.asq.next_to_use = 0; hw->aq.asq.next_to_use = 0;
hw->aq.asq.next_to_clean = 0; hw->aq.asq.next_to_clean = 0;
hw->aq.asq.count = hw->aq.num_asq_entries;
/* allocate the ring memory */ /* allocate the ring memory */
ret_code = i40e_alloc_adminq_asq_ring(hw); ret_code = i40e_alloc_adminq_asq_ring(hw);
@ -391,6 +390,7 @@ static i40e_status i40e_init_asq(struct i40e_hw *hw)
goto init_adminq_free_rings; goto init_adminq_free_rings;
/* success! */ /* success! */
hw->aq.asq.count = hw->aq.num_asq_entries;
goto init_adminq_exit; goto init_adminq_exit;
init_adminq_free_rings: init_adminq_free_rings:
@ -432,7 +432,6 @@ static i40e_status i40e_init_arq(struct i40e_hw *hw)
hw->aq.arq.next_to_use = 0; hw->aq.arq.next_to_use = 0;
hw->aq.arq.next_to_clean = 0; hw->aq.arq.next_to_clean = 0;
hw->aq.arq.count = hw->aq.num_arq_entries;
/* allocate the ring memory */ /* allocate the ring memory */
ret_code = i40e_alloc_adminq_arq_ring(hw); ret_code = i40e_alloc_adminq_arq_ring(hw);
@ -450,6 +449,7 @@ static i40e_status i40e_init_arq(struct i40e_hw *hw)
goto init_adminq_free_rings; goto init_adminq_free_rings;
/* success! */ /* success! */
hw->aq.arq.count = hw->aq.num_arq_entries;
goto init_adminq_exit; goto init_adminq_exit;
init_adminq_free_rings: init_adminq_free_rings: