net/bnxt: improve vector Tx

[dpdk.git] / drivers / net / ice / ice_ethdev.c

diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index d67390f..8fb4b30 100644 (file)
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -65,6 +65,9 @@ static struct proto_xtr_ol_flag ice_proto_xtr_ol_flag_params[] = {
        [PROTO_XTR_TCP] = {
                .param = { .name = "ice_dynflag_proto_xtr_tcp" },
                .ol_flag = &rte_net_ice_dynflag_proto_xtr_tcp_mask },
+       [PROTO_XTR_IP_OFFSET] = {
+               .param = { .name = "ice_dynflag_proto_xtr_ip_offset" },
+               .ol_flag = &rte_net_ice_dynflag_proto_xtr_ip_offset_mask },
 };
 
 #define ICE_DFLT_OUTER_TAG_TYPE ICE_AQ_VSI_OUTER_TAG_VLAN_9100
@@ -202,9 +205,6 @@ static const struct eth_dev_ops ice_eth_dev_ops = {
        .tx_burst_mode_get            = ice_tx_burst_mode_get,
        .get_eeprom_length            = ice_get_eeprom_length,
        .get_eeprom                   = ice_get_eeprom,
-       .rx_queue_count               = ice_rx_queue_count,
-       .rx_descriptor_status         = ice_rx_descriptor_status,
-       .tx_descriptor_status         = ice_tx_descriptor_status,
        .stats_get                    = ice_stats_get,
        .stats_reset                  = ice_stats_reset,
        .xstats_get                   = ice_xstats_get,
@@ -323,6 +323,7 @@ lookup_proto_xtr_type(const char *xtr_name)
                { "ipv6",      PROTO_XTR_IPV6      },
                { "ipv6_flow", PROTO_XTR_IPV6_FLOW },
                { "tcp",       PROTO_XTR_TCP       },
+               { "ip_offset", PROTO_XTR_IP_OFFSET },
        };
        uint32_t i;
 
@@ -568,6 +569,10 @@ ice_check_proto_xtr_support(struct ice_hw *hw)
                [PROTO_XTR_TCP] = { ICE_RXDID_COMMS_AUX_TCP,
                                    ICE_RX_OPC_EXTRACT,
                                    ICE_PROT_TCP_IL, ICE_PROT_ID_INVAL },
+               [PROTO_XTR_IP_OFFSET] = { ICE_RXDID_COMMS_AUX_IP_OFFSET,
+                                         ICE_RX_OPC_PROTID,
+                                         ICE_PROT_IPV4_OF_OR_S,
+                                         ICE_PROT_IPV6_OF_OR_S },
        };
        uint32_t i;
 
@@ -1309,7 +1314,7 @@ ice_handle_aq_msg(struct rte_eth_dev *dev)
                case ice_aqc_opc_get_link_status:
                        ret = ice_link_update(dev, 0);
                        if (!ret)
-                               _rte_eth_dev_callback_process
+                               rte_eth_dev_callback_process
                                        (dev, RTE_ETH_EVENT_INTR_LSC, NULL);
                        break;
                default:
@@ -1374,7 +1379,7 @@ ice_interrupt_handler(void *param)
                PMD_DRV_LOG(INFO, "OICR: link state change event");
                ret = ice_link_update(dev, 0);
                if (!ret)
-                       _rte_eth_dev_callback_process
+                       rte_eth_dev_callback_process
                                (dev, RTE_ETH_EVENT_INTR_LSC, NULL);
        }
 #endif
@@ -2155,6 +2160,9 @@ ice_dev_init(struct rte_eth_dev *dev)
        int ret;
 
        dev->dev_ops = &ice_eth_dev_ops;
+       dev->rx_queue_count = ice_rx_queue_count;
+       dev->rx_descriptor_status = ice_rx_descriptor_status;
+       dev->tx_descriptor_status = ice_tx_descriptor_status;
        dev->rx_pkt_burst = ice_recv_pkts;
        dev->tx_pkt_burst = ice_xmit_pkts;
        dev->tx_pkt_prepare = ice_prep_pkts;
@@ -3661,8 +3669,11 @@ ice_link_update(struct rte_eth_dev *dev, int wait_to_complete)
                link.link_speed = ETH_SPEED_NUM_100G;
                break;
        case ICE_AQ_LINK_SPEED_UNKNOWN:
-       default:
                PMD_DRV_LOG(ERR, "Unknown link speed");
+               link.link_speed = ETH_SPEED_NUM_UNKNOWN;
+               break;
+       default:
+               PMD_DRV_LOG(ERR, "None link speed");
                link.link_speed = ETH_SPEED_NUM_NONE;
                break;
        }
@@ -4404,7 +4415,7 @@ ice_fw_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size)
        build = hw->nvm.orom.build;
 
        ret = snprintf(fw_version, fw_size,
-                       "%d.%d 0x%08x %d.%d.%d",
+                       "%x.%02x 0x%08x %d.%d.%d",
                        hw->nvm.major_ver,
                        hw->nvm.minor_ver,
                        hw->nvm.eetrack,
@@ -5145,7 +5156,7 @@ RTE_PMD_REGISTER_PCI(net_ice, rte_ice_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_ice, pci_id_ice_map);
 RTE_PMD_REGISTER_KMOD_DEP(net_ice, "* igb_uio | uio_pci_generic | vfio-pci");
 RTE_PMD_REGISTER_PARAM_STRING(net_ice,
-                             ICE_PROTO_XTR_ARG "=[queue:]<vlan|ipv4|ipv6|ipv6_flow|tcp>"
+                             ICE_PROTO_XTR_ARG "=[queue:]<vlan|ipv4|ipv6|ipv6_flow|tcp|ip_offset>"
                              ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>"
                              ICE_PIPELINE_MODE_SUPPORT_ARG "=<0|1>"
                              ICE_FLOW_MARK_SUPPORT_ARG "=<0|1>");