diff options
| author | Mitch Williams <mitch.a.williams@intel.com> | 2014-10-16 23:14:52 -0400 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2014-11-03 07:19:28 -0500 |
| commit | 7a28d8857ddc3986b62ae1a41dc551453718b4b3 (patch) | |
| tree | 8298436a553469129adc3b4d2e132da193cf2258 /drivers | |
| parent | 5b5faa434a008e41edcba6d00add5fd591287a54 (diff) | |
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: Marc Neustadter <marc.neustadter@intel.com>
Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Signed-off-by: Patrick Lu <patrick.lu@intel.com>
Tested-by: Jim Young <jamesx.m.young@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_main.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index ea622676ebe7..1b0c437dae21 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c | |||
| @@ -2462,10 +2462,14 @@ static int i40e_configure_tx_ring(struct i40e_ring *ring) | |||
| 2462 | } | 2462 | } |
| 2463 | 2463 | ||
| 2464 | /* Now associate this queue with this PCI function */ | 2464 | /* Now associate this queue with this PCI function */ |
| 2465 | if (vsi->type == I40E_VSI_VMDQ2) | 2465 | if (vsi->type == I40E_VSI_VMDQ2) { |
| 2466 | qtx_ctl = I40E_QTX_CTL_VM_QUEUE; | 2466 | qtx_ctl = I40E_QTX_CTL_VM_QUEUE; |
| 2467 | else | 2467 | qtx_ctl |= ((vsi->id) << I40E_QTX_CTL_VFVM_INDX_SHIFT) & |
| 2468 | I40E_QTX_CTL_VFVM_INDX_MASK; | ||
| 2469 | } else { | ||
| 2468 | qtx_ctl = I40E_QTX_CTL_PF_QUEUE; | 2470 | qtx_ctl = I40E_QTX_CTL_PF_QUEUE; |
| 2471 | } | ||
| 2472 | |||
| 2469 | qtx_ctl |= ((hw->pf_id << I40E_QTX_CTL_PF_INDX_SHIFT) & | 2473 | qtx_ctl |= ((hw->pf_id << I40E_QTX_CTL_PF_INDX_SHIFT) & |
| 2470 | I40E_QTX_CTL_PF_INDX_MASK); | 2474 | I40E_QTX_CTL_PF_INDX_MASK); |
| 2471 | wr32(hw, I40E_QTX_CTL(pf_q), qtx_ctl); | 2475 | wr32(hw, I40E_QTX_CTL(pf_q), qtx_ctl); |