i40e: associate VMDq queue with VM type (9d8bf547) · Commits · 戴 / test

Fix a bug where the queue was not associated with the right set-up within the hardware. The fix is to use the right QTX_CTL VSI type when associating it to the VSI. Change-ID: I65ef6c5a8205601c640a6593e4b7e78d6ba45545 Signed-off-by:

Shannon Nelson <shannon.nelson@intel.com> Signed-off-by:

Jesse Brandeburg <jesse.brandeburg@intel.com> Tested-by:

Sibai Li <sibai.li@intel.com> Signed-off-by:

Aaron Brown <aaron.f.brown@intel.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/ethernet/intel/i40e/Module.symvers

0 → 100644

+0 −0

Empty file added.

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -2206,6 +2206,9 @@ static int i40e_configure_tx_ring(struct i40e_ring *ring)
		}

		/* Now associate this queue with this PCI function */
		if (vsi->type == I40E_VSI_VMDQ2)
		qtx_ctl = I40E_QTX_CTL_VM_QUEUE;
		else
		qtx_ctl = I40E_QTX_CTL_PF_QUEUE;
		qtx_ctl \|= ((hw->pf_id << I40E_QTX_CTL_PF_INDX_SHIFT) &
		I40E_QTX_CTL_PF_INDX_MASK);

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -75,6 +75,7 @@ typedef void (I40E_ADMINQ_CALLBACK)(struct i40e_hw , struct i40e_aq_desc *);

		/* bitfields for Tx queue mapping in QTX_CTL */
		#define I40E_QTX_CTL_VF_QUEUE 0x0
		#define I40E_QTX_CTL_VM_QUEUE 0x1
		#define I40E_QTX_CTL_PF_QUEUE 0x2

		/* debug masks - set these bits in hw->debug_mask to control output */

Admin message