net/hns3: fix statistics

[dpdk.git] / drivers / net / enic / enic_res.c

diff --git a/drivers/net/enic/enic_res.c b/drivers/net/enic/enic_res.c
index 6b404c3..f403a0b 100644 (file)
--- a/drivers/net/enic/enic_res.c
+++ b/drivers/net/enic/enic_res.c
@@ -61,10 +61,10 @@ int enic_get_vnic_config(struct enic *enic)
         * and will be 0 for legacy firmware and VICs
         */
        if (c->max_pkt_size > ENIC_DEFAULT_RX_MAX_PKT_SIZE)
-               enic->max_mtu = c->max_pkt_size - (ETHER_HDR_LEN + 4);
+               enic->max_mtu = c->max_pkt_size - RTE_ETHER_HDR_LEN;
        else
-               enic->max_mtu = ENIC_DEFAULT_RX_MAX_PKT_SIZE
-                               - (ETHER_HDR_LEN + 4);
+               enic->max_mtu = ENIC_DEFAULT_RX_MAX_PKT_SIZE -
+                       RTE_ETHER_HDR_LEN;
        if (c->mtu == 0)
                c->mtu = 1500;
 
@@ -82,18 +82,23 @@ int enic_get_vnic_config(struct enic *enic)
                        "Error getting filter modes, %d\n", err);
                return err;
        }
+       vnic_dev_capable_udp_rss_weak(enic->vdev, &enic->nic_cfg_chk,
+                                     &enic->udp_rss_weak);
 
-       dev_info(enic, "Flow api filter mode: %s Actions: %s%s%s\n",
+       dev_info(enic, "Flow api filter mode: %s Actions: %s%s%s%s\n",
+               ((enic->flow_filter_mode == FILTER_FLOWMAN) ? "FLOWMAN" :
                ((enic->flow_filter_mode == FILTER_DPDK_1) ? "DPDK" :
                ((enic->flow_filter_mode == FILTER_USNIC_IP) ? "USNIC" :
                ((enic->flow_filter_mode == FILTER_IPV4_5TUPLE) ? "5TUPLE" :
-               "NONE"))),
+               "NONE")))),
                ((enic->filter_actions & FILTER_ACTION_RQ_STEERING_FLAG) ?
                 "steer " : ""),
                ((enic->filter_actions & FILTER_ACTION_FILTER_ID_FLAG) ?
                 "tag " : ""),
                ((enic->filter_actions & FILTER_ACTION_DROP_FLAG) ?
-                "drop " : ""));
+                "drop " : ""),
+               ((enic->filter_actions & FILTER_ACTION_COUNTER_FLAG) ?
+                "count " : ""));
 
        c->wq_desc_count =
                min_t(u32, ENIC_MAX_WQ_DESCS,
@@ -124,7 +129,7 @@ int enic_get_vnic_config(struct enic *enic)
                ENIC_SETTING(enic, RXCSUM) ? "yes" : "no",
                ENIC_SETTING(enic, RSS) ?
                        (ENIC_SETTING(enic, RSSHASH_UDPIPV4) ? "+UDP" :
-                       ((ENIC_SETTING(enic, RSSHASH_UDP_WEAK) ? "+udp" :
+                       ((enic->udp_rss_weak ? "+udp" :
                        "yes"))) : "no",
                c->intr_mode == VENET_INTR_MODE_INTX ? "INTx" :
                c->intr_mode == VENET_INTR_MODE_MSI ? "MSI" :
@@ -161,7 +166,7 @@ int enic_get_vnic_config(struct enic *enic)
        if (ENIC_SETTING(enic, RSSHASH_TCPIPV6))
                enic->flow_type_rss_offloads |= ETH_RSS_NONFRAG_IPV6_TCP |
                        ETH_RSS_IPV6_TCP_EX;
-       if (ENIC_SETTING(enic, RSSHASH_UDP_WEAK))
+       if (enic->udp_rss_weak)
                enic->flow_type_rss_offloads |=
                        ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_NONFRAG_IPV6_UDP |
                        ETH_RSS_IPV6_UDP_EX;
@@ -177,11 +182,17 @@ int enic_get_vnic_config(struct enic *enic)
 
        enic->vxlan = ENIC_SETTING(enic, VXLAN) &&
                vnic_dev_capable_vxlan(enic->vdev);
+       if (vnic_dev_capable_geneve(enic->vdev)) {
+               dev_info(NULL, "Geneve with options offload available\n");
+               enic->geneve_opt_avail = 1;
+       }
        /*
         * Default hardware capabilities. enic_dev_init() may add additional
         * flags if it enables overlay offloads.
         */
+       enic->tx_queue_offload_capa = 0;
        enic->tx_offload_capa =
+               enic->tx_queue_offload_capa |
                DEV_TX_OFFLOAD_MULTI_SEGS |
                DEV_TX_OFFLOAD_VLAN_INSERT |
                DEV_TX_OFFLOAD_IPV4_CKSUM |
@@ -191,13 +202,14 @@ int enic_get_vnic_config(struct enic *enic)
        enic->rx_offload_capa =
                DEV_RX_OFFLOAD_SCATTER |
                DEV_RX_OFFLOAD_JUMBO_FRAME |
-               DEV_RX_OFFLOAD_CRC_STRIP |
                DEV_RX_OFFLOAD_VLAN_STRIP |
                DEV_RX_OFFLOAD_IPV4_CKSUM |
                DEV_RX_OFFLOAD_UDP_CKSUM |
                DEV_RX_OFFLOAD_TCP_CKSUM;
        enic->tx_offload_mask =
-               PKT_TX_VLAN_PKT |
+               PKT_TX_IPV6 |
+               PKT_TX_IPV4 |
+               PKT_TX_VLAN |
                PKT_TX_IP_CKSUM |
                PKT_TX_L4_MASK |
                PKT_TX_TCP_SEG;
@@ -205,36 +217,11 @@ int enic_get_vnic_config(struct enic *enic)
        return 0;
 }
 
-int enic_add_vlan(struct enic *enic, u16 vlanid)
-{
-       u64 a0 = vlanid, a1 = 0;
-       int wait = 1000;
-       int err;
-
-       err = vnic_dev_cmd(enic->vdev, CMD_VLAN_ADD, &a0, &a1, wait);
-       if (err)
-               dev_err(enic_get_dev(enic), "Can't add vlan id, %d\n", err);
-
-       return err;
-}
-
-int enic_del_vlan(struct enic *enic, u16 vlanid)
-{
-       u64 a0 = vlanid, a1 = 0;
-       int wait = 1000;
-       int err;
-
-       err = vnic_dev_cmd(enic->vdev, CMD_VLAN_DEL, &a0, &a1, wait);
-       if (err)
-               dev_err(enic_get_dev(enic), "Can't delete vlan id, %d\n", err);
-
-       return err;
-}
-
 int enic_set_nic_cfg(struct enic *enic, u8 rss_default_cpu, u8 rss_hash_type,
        u8 rss_hash_bits, u8 rss_base_cpu, u8 rss_enable, u8 tso_ipid_split_en,
        u8 ig_vlan_strip_en)
 {
+       enum vnic_devcmd_cmd cmd;
        u64 a0, a1;
        u32 nic_cfg;
        int wait = 1000;
@@ -245,8 +232,8 @@ int enic_set_nic_cfg(struct enic *enic, u8 rss_default_cpu, u8 rss_hash_type,
 
        a0 = nic_cfg;
        a1 = 0;
-
-       return vnic_dev_cmd(enic->vdev, CMD_NIC_CFG, &a0, &a1, wait);
+       cmd = enic->nic_cfg_chk ? CMD_NIC_CFG_CHK : CMD_NIC_CFG;
+       return vnic_dev_cmd(enic->vdev, cmd, &a0, &a1, wait);
 }
 
 int enic_set_rss_key(struct enic *enic, dma_addr_t key_pa, u64 len)