From 632c7b6edc21b4f0f0eb39806a11d64f944a87e5 Mon Sep 17 00:00:00 2001 From: Ting Xu Date: Mon, 11 May 2020 15:27:48 +0000 Subject: [PATCH] net/iavf: fix RXDID setting for Rx queue CVL kernel PF configures all reserved queues for VF, including Rx queue RXDID. The number of reserved queues is the maximum between Tx and Rx queues. If the number of the enabled Rx queues is less than that of reserved queues, required RXDID will only be set for those enabled, but default value (0) is set for others. However, RXDID 0 (legacy 16byte descriptor) is not supported now, PF will return error when configuring those disabled VF queues. In this patch, required RXDID is set for all reserved Rx queues, no matter enabled or not. In this way, PF will configure Rx queues correctly without reporting error. Fixes: b8b4c54ef9b0 ("net/iavf: support flexible Rx descriptor in normal path") Signed-off-by: Ting Xu Tested-by: Xiaoxiao Zeng Acked-by: Xiaolong Ye --- drivers/net/iavf/iavf_vchnl.c | 44 +++++++++++++++++------------------ 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c index 5b8d32ee24..33acea54a5 100644 --- a/drivers/net/iavf/iavf_vchnl.c +++ b/drivers/net/iavf/iavf_vchnl.c @@ -638,32 +638,32 @@ iavf_configure_queues(struct iavf_adapter *adapter) vc_qp->rxq.ring_len = rxq[i]->nb_rx_desc; vc_qp->rxq.dma_ring_addr = rxq[i]->rx_ring_phys_addr; vc_qp->rxq.databuffer_size = rxq[i]->rx_buf_len; + } #ifndef RTE_LIBRTE_IAVF_16BYTE_RX_DESC - if (vf->vf_res->vf_cap_flags & - VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC && - vf->supported_rxdid & BIT(IAVF_RXDID_COMMS_OVS_1)) { - vc_qp->rxq.rxdid = IAVF_RXDID_COMMS_OVS_1; - PMD_DRV_LOG(NOTICE, "request RXDID == %d in " - "Queue[%d]", vc_qp->rxq.rxdid, i); - } else { - vc_qp->rxq.rxdid = IAVF_RXDID_LEGACY_1; - PMD_DRV_LOG(NOTICE, "request RXDID == %d in " - "Queue[%d]", vc_qp->rxq.rxdid, i); - } + if (vf->vf_res->vf_cap_flags & + VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC && + vf->supported_rxdid & BIT(IAVF_RXDID_COMMS_OVS_1)) { + vc_qp->rxq.rxdid = IAVF_RXDID_COMMS_OVS_1; + PMD_DRV_LOG(NOTICE, "request RXDID == %d in " + "Queue[%d]", vc_qp->rxq.rxdid, i); + } else { + vc_qp->rxq.rxdid = IAVF_RXDID_LEGACY_1; + PMD_DRV_LOG(NOTICE, "request RXDID == %d in " + "Queue[%d]", vc_qp->rxq.rxdid, i); + } #else - if (vf->vf_res->vf_cap_flags & - VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC && - vf->supported_rxdid & BIT(IAVF_RXDID_LEGACY_0)) { - vc_qp->rxq.rxdid = IAVF_RXDID_LEGACY_0; - PMD_DRV_LOG(NOTICE, "request RXDID == %d in " - "Queue[%d]", vc_qp->rxq.rxdid, i); - } else { - PMD_DRV_LOG(ERR, "RXDID == 0 is not supported"); - return -1; - } -#endif + if (vf->vf_res->vf_cap_flags & + VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC && + vf->supported_rxdid & BIT(IAVF_RXDID_LEGACY_0)) { + vc_qp->rxq.rxdid = IAVF_RXDID_LEGACY_0; + PMD_DRV_LOG(NOTICE, "request RXDID == %d in " + "Queue[%d]", vc_qp->rxq.rxdid, i); + } else { + PMD_DRV_LOG(ERR, "RXDID == 0 is not supported"); + return -1; } +#endif } memset(&args, 0, sizeof(args)); -- 2.20.1