Currently, in ice_check_fdir_programming_status, descriptor fields are accessed through direct bit mask manipulation and shifts. The ice driver has macros for this, so rewrite the function to use FIELD_GET macros instead.
Signed-off-by: Omar Munchaev <[email protected]> --- drivers/net/intel/ice/ice_rxtx.c | 37 ++++++++++++-------------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/drivers/net/intel/ice/ice_rxtx.c b/drivers/net/intel/ice/ice_rxtx.c index 882af80833..f14e5e56b5 100644 --- a/drivers/net/intel/ice/ice_rxtx.c +++ b/drivers/net/intel/ice/ice_rxtx.c @@ -4465,36 +4465,27 @@ static inline int ice_check_fdir_programming_status(struct ci_rx_queue *rxq) { volatile union ci_rx_flex_desc *rxdp; - uint16_t qword1; - uint16_t rx_status; - uint16_t error; - uint16_t id; + uint32_t stat_err, error, id int ret = -EAGAIN; rxdp = &rxq->rx_flex_ring[rxq->rx_tail]; - qword1 = rte_le_to_cpu_16(rxdp->wb.status_error0); - rx_status = (qword1 & ICE_RXD_QW1_STATUS_M) - >> ICE_RXD_QW1_STATUS_S; - - if (rx_status & (1 << ICE_RX_DESC_STATUS_DD_S)) { - ret = 0; - error = (qword1 & ICE_RX_PROG_STATUS_DESC_WB_QW1_FAIL_M) >> - ICE_RX_PROG_STATUS_DESC_WB_QW1_FAIL_S; - id = (qword1 & ICE_RX_PROG_STATUS_DESC_WB_QW1_PROGID_M) >> - ICE_RX_PROG_STATUS_DESC_WB_QW1_PROGID_S; - if (error) { - if (id == ICE_RX_PROG_STATUS_DESC_WB_QW1_PROG_ADD) - PMD_DRV_LOG(ERR, "Failed to add FDIR rule."); - else if (id == ICE_RX_PROG_STATUS_DESC_WB_QW1_PROG_DEL) - PMD_DRV_LOG(ERR, "Failed to remove FDIR rule."); + stat_err = rte_le_to_cpu_16(rxdp->wb.status_error0); + if (FIELD_GET(ICE_FXD_FLTR_WB_QW1_DD_M, stat_err) == ICE_FXD_FLTR_WB_QW1_DD_YES) { + id = FIELD_GET(ICE_FXD_FLTR_WB_QW1_PROG_ID_M, stat_err); + error = FIELD_GET(ICE_FXD_FLTR_WB_QW1_FAIL_M, stat_err); + if (error == ICE_FXD_FLTR_WB_QW1_FAIL_YES) { + if (id == ICE_FXD_FLTR_WB_QW1_PROG_ADD) + PMD_DRV_LOG(ERR, "Failed to add FDIR rule due to no space in the table"); + else + PMD_DRV_LOG(ERR, "Failed to remove FDIR rule, attempt to remove non-existent entry"); ret = -EINVAL; goto err; } - error = (qword1 & ICE_RX_PROG_STATUS_DESC_WB_QW1_FAIL_PROF_M) >> - ICE_RX_PROG_STATUS_DESC_WB_QW1_FAIL_PROF_S; - if (error) { - PMD_DRV_LOG(ERR, "Failed to create FDIR profile."); + error = FIELD_GET(ICE_FXD_FLTR_WB_QW1_FAIL_PROF_M, stat_err); + if (error == ICE_FXD_FLTR_WB_QW1_FAIL_PROF_YES) { + PMD_DRV_LOG(ERR, "Profile matching error"); ret = -EINVAL; + goto err; } err: rxdp->wb.status_error0 = 0; -- 2.55.0
