common/cnxk: add lower bound check for SSO resources

[dpdk.git] / drivers / net / ice / ice_rxtx_vec_common.h

diff --git a/drivers/net/ice/ice_rxtx_vec_common.h b/drivers/net/ice/ice_rxtx_vec_common.h
index f0f9926..2dd2d83 100644 (file)
--- a/drivers/net/ice/ice_rxtx_vec_common.h
+++ b/drivers/net/ice/ice_rxtx_vec_common.h
@@ -248,23 +248,24 @@ ice_rxq_vec_setup_default(struct ice_rx_queue *rxq)
 }
 
 #define ICE_TX_NO_VECTOR_FLAGS (                       \
-               DEV_TX_OFFLOAD_MULTI_SEGS |             \
-               DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM |       \
-               DEV_TX_OFFLOAD_TCP_TSO)
+               RTE_ETH_TX_OFFLOAD_MULTI_SEGS |         \
+               RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM |   \
+               RTE_ETH_TX_OFFLOAD_TCP_TSO |    \
+               RTE_ETH_TX_OFFLOAD_OUTER_UDP_CKSUM)
 
 #define ICE_TX_VECTOR_OFFLOAD (                                \
-               DEV_TX_OFFLOAD_VLAN_INSERT |            \
-               DEV_TX_OFFLOAD_QINQ_INSERT |            \
-               DEV_TX_OFFLOAD_IPV4_CKSUM |             \
-               DEV_TX_OFFLOAD_SCTP_CKSUM |             \
-               DEV_TX_OFFLOAD_UDP_CKSUM |              \
-               DEV_TX_OFFLOAD_TCP_CKSUM)
+               RTE_ETH_TX_OFFLOAD_VLAN_INSERT |                \
+               RTE_ETH_TX_OFFLOAD_QINQ_INSERT |                \
+               RTE_ETH_TX_OFFLOAD_IPV4_CKSUM |         \
+               RTE_ETH_TX_OFFLOAD_SCTP_CKSUM |         \
+               RTE_ETH_TX_OFFLOAD_UDP_CKSUM |          \
+               RTE_ETH_TX_OFFLOAD_TCP_CKSUM)
 
 #define ICE_RX_VECTOR_OFFLOAD (                                \
-               DEV_RX_OFFLOAD_CHECKSUM |               \
-               DEV_RX_OFFLOAD_SCTP_CKSUM |             \
-               DEV_RX_OFFLOAD_VLAN |                   \
-               DEV_RX_OFFLOAD_RSS_HASH)
+               RTE_ETH_RX_OFFLOAD_CHECKSUM |           \
+               RTE_ETH_RX_OFFLOAD_SCTP_CKSUM |         \
+               RTE_ETH_RX_OFFLOAD_VLAN |                       \
+               RTE_ETH_RX_OFFLOAD_RSS_HASH)
 
 #define ICE_VECTOR_PATH                0
 #define ICE_VECTOR_OFFLOAD_PATH        1
@@ -287,7 +288,7 @@ ice_rx_vec_queue_default(struct ice_rx_queue *rxq)
        if (rxq->proto_xtr != PROTO_XTR_NONE)
                return -1;
 
-       if (rxq->offloads & DEV_RX_OFFLOAD_TIMESTAMP)
+       if (rxq->offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP)
                return -1;
 
        if (rxq->offloads & ICE_RX_VECTOR_OFFLOAD)
@@ -366,36 +367,36 @@ ice_txd_enable_offload(struct rte_mbuf *tx_pkt,
        /* Tx Checksum Offload */
        /* SET MACLEN */
        td_offset |= (tx_pkt->l2_len >> 1) <<
-                       ICE_TX_DESC_LEN_MACLEN_S;
+               ICE_TX_DESC_LEN_MACLEN_S;
 
        /* Enable L3 checksum offload */
-       if (ol_flags & PKT_TX_IP_CKSUM) {
+       if (ol_flags & RTE_MBUF_F_TX_IP_CKSUM) {
                td_cmd |= ICE_TX_DESC_CMD_IIPT_IPV4_CSUM;
                td_offset |= (tx_pkt->l3_len >> 2) <<
                        ICE_TX_DESC_LEN_IPLEN_S;
-       } else if (ol_flags & PKT_TX_IPV4) {
+       } else if (ol_flags & RTE_MBUF_F_TX_IPV4) {
                td_cmd |= ICE_TX_DESC_CMD_IIPT_IPV4;
                td_offset |= (tx_pkt->l3_len >> 2) <<
                        ICE_TX_DESC_LEN_IPLEN_S;
-       } else if (ol_flags & PKT_TX_IPV6) {
+       } else if (ol_flags & RTE_MBUF_F_TX_IPV6) {
                td_cmd |= ICE_TX_DESC_CMD_IIPT_IPV6;
                td_offset |= (tx_pkt->l3_len >> 2) <<
                        ICE_TX_DESC_LEN_IPLEN_S;
        }
 
        /* Enable L4 checksum offloads */
-       switch (ol_flags & PKT_TX_L4_MASK) {
-       case PKT_TX_TCP_CKSUM:
+       switch (ol_flags & RTE_MBUF_F_TX_L4_MASK) {
+       case RTE_MBUF_F_TX_TCP_CKSUM:
                td_cmd |= ICE_TX_DESC_CMD_L4T_EOFT_TCP;
                td_offset |= (sizeof(struct rte_tcp_hdr) >> 2) <<
                        ICE_TX_DESC_LEN_L4_LEN_S;
                break;
-       case PKT_TX_SCTP_CKSUM:
+       case RTE_MBUF_F_TX_SCTP_CKSUM:
                td_cmd |= ICE_TX_DESC_CMD_L4T_EOFT_SCTP;
                td_offset |= (sizeof(struct rte_sctp_hdr) >> 2) <<
                        ICE_TX_DESC_LEN_L4_LEN_S;
                break;
-       case PKT_TX_UDP_CKSUM:
+       case RTE_MBUF_F_TX_UDP_CKSUM:
                td_cmd |= ICE_TX_DESC_CMD_L4T_EOFT_UDP;
                td_offset |= (sizeof(struct rte_udp_hdr) >> 2) <<
                        ICE_TX_DESC_LEN_L4_LEN_S;
@@ -407,7 +408,7 @@ ice_txd_enable_offload(struct rte_mbuf *tx_pkt,
        *txd_hi |= ((uint64_t)td_offset) << ICE_TXD_QW1_OFFSET_S;
 
        /* Tx VLAN/QINQ insertion Offload */
-       if (ol_flags & (PKT_TX_VLAN | PKT_TX_QINQ)) {
+       if (ol_flags & (RTE_MBUF_F_TX_VLAN | RTE_MBUF_F_TX_QINQ)) {
                td_cmd |= ICE_TX_DESC_CMD_IL2TAG1;
                *txd_hi |= ((uint64_t)tx_pkt->vlan_tci <<
                                ICE_TXD_QW1_L2TAG1_S);