Skip to content

Commit 3cb18cf

Browse files
lczapnikgregkh
authored andcommitted
i40e: add mask to apply valid bits for itr_idx
commit eac0442 upstream. The ITR index (itr_idx) is only 2 bits wide. When constructing the register value for QINT_RQCTL, all fields are ORed together. Without masking, higher bits from itr_idx may overwrite adjacent fields in the register. Apply I40E_QINT_RQCTL_ITR_INDX_MASK to ensure only the intended bits are set. Fixes: 5c3c48a ("i40e: implement virtual device interface") Cc: stable@vger.kernel.org Signed-off-by: Lukasz Czapnik <lukasz.czapnik@intel.com> Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com> Signed-off-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> Reviewed-by: Simon Horman <horms@kernel.org> Tested-by: Rafal Romanowski <rafal.romanowski@intel.com> Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent e490d8c commit 3cb18cf

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ static void i40e_config_irq_link_list(struct i40e_vf *vf, u16 vsi_id,
393393
(qtype << I40E_QINT_RQCTL_NEXTQ_TYPE_SHIFT) |
394394
(pf_queue_id << I40E_QINT_RQCTL_NEXTQ_INDX_SHIFT) |
395395
BIT(I40E_QINT_RQCTL_CAUSE_ENA_SHIFT) |
396-
(itr_idx << I40E_QINT_RQCTL_ITR_INDX_SHIFT);
396+
FIELD_PREP(I40E_QINT_RQCTL_ITR_INDX_MASK, itr_idx);
397397
wr32(hw, reg_idx, reg);
398398
}
399399

0 commit comments

Comments
 (0)