git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
common/cnxk: use computed value for WQE skip
[dpdk.git] / drivers / net / ipn3ke / ipn3ke_representor.c
diff --git a/drivers/net/ipn3ke/ipn3ke_representor.c b/drivers/net/ipn3ke/ipn3ke_representor.c
index 0438c3f..abbecfd 100644 (file)
--- a/drivers/net/ipn3ke/ipn3ke_representor.c
+++ b/drivers/net/ipn3ke/ipn3ke_representor.c
@@ -50,11 +50,11 @@ ipn3ke_rpst_dev_infos_get(struct rte_eth_dev *ethdev,
        dev_info->speed_capa =
                (hw->retimer.mac_type ==
                        IFPGA_RAWDEV_RETIMER_MAC_TYPE_10GE_XFI) ?
-               ETH_LINK_SPEED_10G :
+               RTE_ETH_LINK_SPEED_10G :
                ((hw->retimer.mac_type ==
                        IFPGA_RAWDEV_RETIMER_MAC_TYPE_25GE_25GAUI) ?
-               ETH_LINK_SPEED_25G :
-               ETH_LINK_SPEED_AUTONEG);
+               RTE_ETH_LINK_SPEED_25G :
+               RTE_ETH_LINK_SPEED_AUTONEG);
 
        dev_info->max_rx_queues  = 1;
        dev_info->max_tx_queues  = 1;
@@ -67,36 +67,36 @@ ipn3ke_rpst_dev_infos_get(struct rte_eth_dev *ethdev,
        };
        dev_info->rx_queue_offload_capa = 0;
        dev_info->rx_offload_capa =
-               DEV_RX_OFFLOAD_VLAN_STRIP |
-               DEV_RX_OFFLOAD_QINQ_STRIP |
-               DEV_RX_OFFLOAD_IPV4_CKSUM |
-               DEV_RX_OFFLOAD_UDP_CKSUM |
-               DEV_RX_OFFLOAD_TCP_CKSUM |
-               DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM |
-               DEV_RX_OFFLOAD_VLAN_EXTEND |
-               DEV_RX_OFFLOAD_VLAN_FILTER |
-               DEV_RX_OFFLOAD_JUMBO_FRAME;
-
-       dev_info->tx_queue_offload_capa = DEV_TX_OFFLOAD_MBUF_FAST_FREE;
+               RTE_ETH_RX_OFFLOAD_VLAN_STRIP |
+               RTE_ETH_RX_OFFLOAD_QINQ_STRIP |
+               RTE_ETH_RX_OFFLOAD_IPV4_CKSUM |
+               RTE_ETH_RX_OFFLOAD_UDP_CKSUM |
+               RTE_ETH_RX_OFFLOAD_TCP_CKSUM |
+               RTE_ETH_RX_OFFLOAD_OUTER_IPV4_CKSUM |
+               RTE_ETH_RX_OFFLOAD_VLAN_EXTEND |
+               RTE_ETH_RX_OFFLOAD_VLAN_FILTER;
+
+       dev_info->tx_queue_offload_capa = RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE;
        dev_info->tx_offload_capa =
-               DEV_TX_OFFLOAD_VLAN_INSERT |
-               DEV_TX_OFFLOAD_QINQ_INSERT |
-               DEV_TX_OFFLOAD_IPV4_CKSUM |
-               DEV_TX_OFFLOAD_UDP_CKSUM |
-               DEV_TX_OFFLOAD_TCP_CKSUM |
-               DEV_TX_OFFLOAD_SCTP_CKSUM |
-               DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM |
-               DEV_TX_OFFLOAD_TCP_TSO |
-               DEV_TX_OFFLOAD_VXLAN_TNL_TSO |
-               DEV_TX_OFFLOAD_GRE_TNL_TSO |
-               DEV_TX_OFFLOAD_IPIP_TNL_TSO |
-               DEV_TX_OFFLOAD_GENEVE_TNL_TSO |
-               DEV_TX_OFFLOAD_MULTI_SEGS |
+               RTE_ETH_TX_OFFLOAD_VLAN_INSERT |
+               RTE_ETH_TX_OFFLOAD_QINQ_INSERT |
+               RTE_ETH_TX_OFFLOAD_IPV4_CKSUM |
+               RTE_ETH_TX_OFFLOAD_UDP_CKSUM |
+               RTE_ETH_TX_OFFLOAD_TCP_CKSUM |
+               RTE_ETH_TX_OFFLOAD_SCTP_CKSUM |
+               RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM |
+               RTE_ETH_TX_OFFLOAD_TCP_TSO |
+               RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO |
+               RTE_ETH_TX_OFFLOAD_GRE_TNL_TSO |
+               RTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO |
+               RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO |
+               RTE_ETH_TX_OFFLOAD_MULTI_SEGS |
                dev_info->tx_queue_offload_capa;
 
        dev_info->dev_capa =
                RTE_ETH_DEV_CAPA_RUNTIME_RX_QUEUE_SETUP |
                RTE_ETH_DEV_CAPA_RUNTIME_TX_QUEUE_SETUP;
+       dev_info->dev_capa &= ~RTE_ETH_DEV_CAPA_FLOW_RULE_KEEP;
 
        dev_info->switch_info.name = ethdev->device->name;
        dev_info->switch_info.domain_id = rpst->switch_domain_id;
@@ -2218,9 +2218,6 @@ ipn3ke_rpst_xstats_get
        struct ipn3ke_rpst_hw_port_stats hw_stats;
        struct rte_eth_stats stats;
 
-       if (!xstats)
-               return 0;
-
        if (!ethdev) {
                IPN3KE_AFU_PMD_ERR("ethernet device to get statistics is NULL");
                return -EINVAL;
@@ -2282,7 +2279,7 @@ ipn3ke_rpst_xstats_get
                count++;
        }
 
-       /* Get individiual stats from ipn3ke_rpst_hw_port */
+       /* Get individual stats from ipn3ke_rpst_hw_port */
        for (i = 0; i < IPN3KE_RPST_HW_PORT_XSTATS_CNT; i++) {
                xstats[count].value = *(uint64_t *)(((char *)(&hw_stats)) +
                        ipn3ke_rpst_hw_port_strings[i].offset);
@@ -2290,7 +2287,7 @@ ipn3ke_rpst_xstats_get
                count++;
        }
 
-       /* Get individiual stats from ipn3ke_rpst_rxq_pri */
+       /* Get individual stats from ipn3ke_rpst_rxq_pri */
        for (i = 0; i < IPN3KE_RPST_RXQ_PRIO_XSTATS_CNT; i++) {
                for (prio = 0; prio < IPN3KE_RPST_PRIO_XSTATS_CNT; prio++) {
                        xstats[count].value =
@@ -2302,7 +2299,7 @@ ipn3ke_rpst_xstats_get
                }
        }
 
-       /* Get individiual stats from ipn3ke_rpst_txq_prio */
+       /* Get individual stats from ipn3ke_rpst_txq_prio */
        for (i = 0; i < IPN3KE_RPST_TXQ_PRIO_XSTATS_CNT; i++) {
                for (prio = 0; prio < IPN3KE_RPST_PRIO_XSTATS_CNT; prio++) {
                        xstats[count].value =
@@ -2340,7 +2337,7 @@ __rte_unused unsigned int limit)
                count++;
        }
 
-       /* Get individiual stats from ipn3ke_rpst_hw_port */
+       /* Get individual stats from ipn3ke_rpst_hw_port */
        for (i = 0; i < IPN3KE_RPST_HW_PORT_XSTATS_CNT; i++) {
                snprintf(xstats_names[count].name,
                         sizeof(xstats_names[count].name),
@@ -2349,7 +2346,7 @@ __rte_unused unsigned int limit)
                count++;
        }
 
-       /* Get individiual stats from ipn3ke_rpst_rxq_pri */
+       /* Get individual stats from ipn3ke_rpst_rxq_pri */
        for (i = 0; i < IPN3KE_RPST_RXQ_PRIO_XSTATS_CNT; i++) {
                for (prio = 0; prio < 8; prio++) {
                        snprintf(xstats_names[count].name,
@@ -2361,7 +2358,7 @@ __rte_unused unsigned int limit)
                }
        }
 
-       /* Get individiual stats from ipn3ke_rpst_txq_prio */
+       /* Get individual stats from ipn3ke_rpst_txq_prio */
        for (i = 0; i < IPN3KE_RPST_TXQ_PRIO_XSTATS_CNT; i++) {
                for (prio = 0; prio < 8; prio++) {
                        snprintf(xstats_names[count].name,
@@ -2400,10 +2397,10 @@ ipn3ke_update_link(struct rte_rawdev *rawdev,
                                (uint64_t *)&link_speed);
        switch (link_speed) {
        case IFPGA_RAWDEV_LINK_SPEED_10GB:
-               link->link_speed = ETH_SPEED_NUM_10G;
+               link->link_speed = RTE_ETH_SPEED_NUM_10G;
                break;
        case IFPGA_RAWDEV_LINK_SPEED_25GB:
-               link->link_speed = ETH_SPEED_NUM_25G;
+               link->link_speed = RTE_ETH_SPEED_NUM_25G;
                break;
        default:
                IPN3KE_AFU_PMD_ERR("Unknown link speed info %u", link_speed);
@@ -2461,9 +2458,9 @@ ipn3ke_rpst_link_update(struct rte_eth_dev *ethdev,
 
        memset(&link, 0, sizeof(link));
 
-       link.link_duplex = ETH_LINK_FULL_DUPLEX;
+       link.link_duplex = RTE_ETH_LINK_FULL_DUPLEX;
        link.link_autoneg = !(ethdev->data->dev_conf.link_speeds &
-                               ETH_LINK_SPEED_FIXED);
+                               RTE_ETH_LINK_SPEED_FIXED);
 
        rawdev = hw->rawdev;
        ipn3ke_update_link(rawdev, rpst->port_id, &link);
@@ -2519,9 +2516,9 @@ ipn3ke_rpst_link_check(struct ipn3ke_rpst *rpst)
 
        memset(&link, 0, sizeof(link));
 
-       link.link_duplex = ETH_LINK_FULL_DUPLEX;
+       link.link_duplex = RTE_ETH_LINK_FULL_DUPLEX;
        link.link_autoneg = !(rpst->ethdev->data->dev_conf.link_speeds &
-                               ETH_LINK_SPEED_FIXED);
+                               RTE_ETH_LINK_SPEED_FIXED);
 
        rawdev = hw->rawdev;
        ipn3ke_update_link(rawdev, rpst->port_id, &link);
DPDK repo used for reviews