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

Commit 7a28d885 authored by Mitch Williams's avatar Mitch Williams Committed by Jeff Kirsher
Browse files

i40e: configure VM ID in qtx_ctl 



We must insert the VSI ID in the QTX_CTL register when
configuring queues for VMDQ VSIs.

Change-ID: Iedfe36bd42ca0adc90a7cc2b7cf04795a98f4761
Reported-by: default avatarMarc Neustadter <marc.neustadter@intel.com>
Signed-off-by: default avatarMitch Williams <mitch.a.williams@intel.com>
Signed-off-by: default avatarPatrick Lu <patrick.lu@intel.com>
Tested-by: default avatarJim Young <jamesx.m.young@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 5b5faa43

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

+6 −2
Original line number Diff line number Diff line
@@ -2462,10 +2462,14 @@ static int i40e_configure_tx_ring(struct i40e_ring *ring) 
	}



	/* Now associate this queue with this PCI function */

	if (vsi->type == I40E_VSI_VMDQ2)

	if (vsi->type == I40E_VSI_VMDQ2) {

		qtx_ctl = I40E_QTX_CTL_VM_QUEUE;

	else

		qtx_ctl |= ((vsi->id) << I40E_QTX_CTL_VFVM_INDX_SHIFT) &

			   I40E_QTX_CTL_VFVM_INDX_MASK;

	} 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);

	wr32(hw, I40E_QTX_CTL(pf_q), qtx_ctl);