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

Commit e02a7f83 authored by Anjali Singhai Jain's avatar Anjali Singhai Jain Committed by Jeff Kirsher
Browse files

i40evf: Remove PF specific register definitions from the VF 



There were quite a few issues when the wrong defines were getting used
in the VF driver. This patch fixes the code where PF driver registers
were getting used for VF driver, and also removes the registers that are
not being used from the VF register file.

Change-ID: If116a9730112950d006eb8ec763998fc914cc839
Signed-off-by: default avatarAnjali Singhai Jain <anjali.singhai@intel.com>
Acked-by: default avatarMitch Williams <mitch.a.williams@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent b1f3366b

drivers/net/ethernet/intel/i40evf/i40e_adminq.c

+3 −14
Original line number Diff line number Diff line
@@ -60,17 +60,6 @@ static void i40e_adminq_init_regs(struct i40e_hw *hw) 
		hw->aq.arq.len  = I40E_VF_ARQLEN1;

		hw->aq.arq.bal  = I40E_VF_ARQBAL1;

		hw->aq.arq.bah  = I40E_VF_ARQBAH1;

	} else {

		hw->aq.asq.tail = I40E_PF_ATQT;

		hw->aq.asq.head = I40E_PF_ATQH;

		hw->aq.asq.len  = I40E_PF_ATQLEN;

		hw->aq.asq.bal  = I40E_PF_ATQBAL;

		hw->aq.asq.bah  = I40E_PF_ATQBAH;

		hw->aq.arq.tail = I40E_PF_ARQT;

		hw->aq.arq.head = I40E_PF_ARQH;

		hw->aq.arq.len  = I40E_PF_ARQLEN;

		hw->aq.arq.bal  = I40E_PF_ARQBAL;

		hw->aq.arq.bah  = I40E_PF_ARQBAH;

	}

}
@@ -308,7 +297,7 @@ static i40e_status i40e_config_asq_regs(struct i40e_hw *hw) 


	/* set starting point */

	wr32(hw, hw->aq.asq.len, (hw->aq.num_asq_entries |

				  I40E_PF_ATQLEN_ATQENABLE_MASK));

				  I40E_VF_ATQLEN1_ATQENABLE_MASK));

	wr32(hw, hw->aq.asq.bal, lower_32_bits(hw->aq.asq.desc_buf.pa));

	wr32(hw, hw->aq.asq.bah, upper_32_bits(hw->aq.asq.desc_buf.pa));
@@ -337,7 +326,7 @@ static i40e_status i40e_config_arq_regs(struct i40e_hw *hw) 


	/* set starting point */

	wr32(hw, hw->aq.arq.len, (hw->aq.num_arq_entries |

				  I40E_PF_ARQLEN_ARQENABLE_MASK));

				  I40E_VF_ARQLEN1_ARQENABLE_MASK));

	wr32(hw, hw->aq.arq.bal, lower_32_bits(hw->aq.arq.desc_buf.pa));

	wr32(hw, hw->aq.arq.bah, upper_32_bits(hw->aq.arq.desc_buf.pa));
@@ -899,7 +888,7 @@ i40e_status i40evf_clean_arq_element(struct i40e_hw *hw, 
	mutex_lock(&hw->aq.arq_mutex);



	/* set next_to_use to head */

	ntu = (rd32(hw, hw->aq.arq.head) & I40E_PF_ARQH_ARQH_MASK);

	ntu = (rd32(hw, hw->aq.arq.head) & I40E_VF_ARQH1_ARQH_MASK);

	if (ntu == ntc) {

		/* nothing to do - shouldn't need to update ring's values */

		ret_code = I40E_ERR_ADMIN_QUEUE_NO_WORK;

drivers/net/ethernet/intel/i40evf/i40e_common.c

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ bool i40evf_check_asq_alive(struct i40e_hw *hw) 
{

	if (hw->aq.asq.len)

		return !!(rd32(hw, hw->aq.asq.len) &

			  I40E_PF_ATQLEN_ATQENABLE_MASK);

			  I40E_VF_ATQLEN1_ATQENABLE_MASK);

	else

		return false;

}

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

+0 −3093

File changed.

Preview size limit exceeded, changes collapsed.