net/ice: fix build with 16 byte Rx descriptor in DCF
PATCH 1/1 net/ice: fix build with 16 byte Rx descriptor in DCF
Fix the build error in DCF when CONFIG_RTE_LIBRTE_ICE_16BYTE_RX_DESC compilation option is enabled. Legacy 16 byte Rx descriptor is not supported in DCF. If it is enabled, DCF configuration stops.
--- drivers/net/ice/ice_dcf.c | 15 +++++++++++++++ drivers/net/ice/ice_dcf_ethdev.c | 4 +++- 2 files changed, 18 insertions(+), 1 deletion(-)
drivers/net/ice/ice_dcf.c +15 -0
@@ -827,6 +827,7 @@ ice_dcf_init_rss(struct ice_dcf_hw *hw)return 0 ; } +#define IAVF_RXDID_LEGACY_0 0#define IAVF_RXDID_LEGACY_1 1#define IAVF_RXDID_COMMS_GENERIC 16
@@ -872,6 +873,7 @@ ice_dcf_configure_queues(struct ice_dcf_hw *hw) vc_qp->rxq.dma_ring_addr = rxq[i]->rx_ring_dma; vc_qp->rxq.databuffer_size = rxq[i]->rx_buf_len; +#ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC if (hw->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC && hw->supported_rxdid &
@@ -883,6 +885,19 @@ ice_dcf_configure_queues(struct ice_dcf_hw *hw)PMD_DRV_LOG (ERR ,"RXDID 16 is not supported" ); return -EINVAL; } +#else +if (hw->vf_res->vf_cap_flags & +VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC && + hw->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 -EINVAL ; + } +#endif }memset (&args,0 ,sizeof (args));
drivers/net/ice/ice_dcf_ethdev.c +3 -1
@@ -230,7 +230,7 @@ ice_dcf_config_rx_queues_irqs(struct rte_eth_dev *dev,static int alloc_rxq_mbufs (struct ice_rx_queue *rxq) { -volatile union ice_32b_rx_flex_desc *rxd; +volatile union ice_rx_flex_desc *rxd;struct rte_mbuf *mbuf =NULL ;uint64_t dma_addr;uint16_t i;
@@ -254,8 +254,10 @@ alloc_rxq_mbufs(struct ice_rx_queue *rxq) rxd = &rxq->rx_ring[i]; rxd->read.pkt_addr = dma_addr; rxd->read.hdr_addr =0 ; +#ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC rxd->read.rsvd1 =0 ; rxd->read.rsvd2 =0 ; +#endif rxq->sw_ring[i].mbuf = (void *)mbuf; }
Signature · 1 line
2.17.1
Quoted 10 lines
-----Original Message-----
From: Xu, Ting <[email protected]>
Sent: Friday, July 3, 2020 4:57 PM
To: [email protected]
Cc: Yang, Qiming <[email protected]>; Zhang, Qi Z <[email protected]>; [email protected]
Subject: [PATCH v1] net/ice: fix build with 16 byte Rx descriptor in DCF
Quoted 6 lines
Fix the build error in DCF when
CONFIG_RTE_LIBRTE_ICE_16BYTE_RX_DESCcompilation option is enabled. Legacy 16 byte Rx descriptor is not supported in DCF. If it is enabled, DCF configuration stops.Fixes 929eceefaba7 ("net/ice: add queue start and stop for DCF")
cc stable is not necessary since fix on latest release.
Quoted 2 lines
Signed-off-by Ting Xu <[email protected]>
Applied to dpdk-next-net-intel.
Thanks
Qi