net/hinic/base: optimize log style
[dpdk.git] / drivers / net / hinic / hinic_pmd_ethdev.c
index 96967a3..4091cf1 100644 (file)
@@ -36,7 +36,6 @@
 
 /* Mezz card for Blade Server */
 #define HINIC_DEV_ID_MEZZ_25GE         0x0210
-#define HINIC_DEV_ID_MEZZ_40GE         0x020D
 #define HINIC_DEV_ID_MEZZ_100GE                0x0205
 
 /* 2*25G and 2*100G card */
 #define NR_MAX_COS                     8
 
 #define HINIC_MIN_RX_BUF_SIZE          1024
-#define HINIC_MAX_MAC_ADDRS            1
+#define HINIC_MAX_UC_MAC_ADDRS         128
+#define HINIC_MAX_MC_MAC_ADDRS         2048
+
+#define HINIC_DEFAULT_BURST_SIZE       32
+#define HINIC_DEFAULT_NB_QUEUES                1
+#define HINIC_DEFAULT_RING_SIZE                1024
+#define HINIC_MAX_LRO_SIZE             65536
 
 /*
  * vlan_id is a 12 bit number.
@@ -70,6 +75,9 @@
 #define HINIC_PKTLEN_TO_MTU(pktlen)    \
        ((pktlen) - (ETH_HLEN + ETH_CRC_LEN))
 
+/* lro numer limit for one packet */
+#define HINIC_LRO_WQE_NUM_DEFAULT      8
+
 /* Driver-specific log messages type */
 int hinic_logtype;
 
@@ -255,7 +263,7 @@ static int hinic_vlan_offload_set(struct rte_eth_dev *dev, int mask);
  * specific event.
  *
  * @param: The address of parameter (struct rte_eth_dev *) regsitered before.
- **/
+ */
 static void hinic_dev_interrupt_handler(void *param)
 {
        struct rte_eth_dev *dev = param;
@@ -310,6 +318,9 @@ static int hinic_dev_configure(struct rte_eth_dev *dev)
                return -EINVAL;
        }
 
+       if (dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG)
+               dev->data->dev_conf.rxmode.offloads |= DEV_RX_OFFLOAD_RSS_HASH;
+
        /* mtu size is 256~9600 */
        if (dev->data->dev_conf.rxmode.max_rx_pkt_len < HINIC_MIN_FRAME_SIZE ||
            dev->data->dev_conf.rxmode.max_rx_pkt_len >
@@ -336,11 +347,14 @@ static int hinic_dev_configure(struct rte_eth_dev *dev)
        err = hinic_vlan_offload_set(dev,
                                ETH_VLAN_STRIP_MASK | ETH_VLAN_FILTER_MASK);
        if (err) {
-               PMD_DRV_LOG(ERR, "Initialize vlan filter and strip failed\n");
+               PMD_DRV_LOG(ERR, "Initialize vlan filter and strip failed");
                (void)hinic_config_mq_mode(dev, FALSE);
                return err;
        }
 
+       /*clear fdir filter flag in function table*/
+       hinic_free_fdir_filter(nic_dev);
+
        return HINIC_OK;
 }
 
@@ -425,7 +439,7 @@ static int hinic_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
        nic_dev->rxqs[queue_idx] = rxq;
 
        /* alloc rx sq hw wqepage*/
-       rc = hinic_create_rq(hwdev, queue_idx, rq_depth);
+       rc = hinic_create_rq(hwdev, queue_idx, rq_depth, socket_id);
        if (rc) {
                PMD_DRV_LOG(ERR, "Create rxq[%d] failed, dev_name: %s, rq_depth: %d",
                            queue_idx, dev->data->name, rq_depth);
@@ -452,6 +466,7 @@ static int hinic_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
        rxq->q_depth = rq_depth;
        rxq->buf_len = (u16)buf_size;
        rxq->rx_free_thresh = rx_free_thresh;
+       rxq->socket_id = socket_id;
 
        /* the last point cant do mbuf rearm in bulk */
        rxq->rxinfo_align_end = rxq->q_depth - rxq->rx_free_thresh;
@@ -462,7 +477,7 @@ static int hinic_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
        /* alloc rx_cqe and prepare rq_wqe */
        rc = hinic_setup_rx_resources(rxq);
        if (rc) {
-               PMD_DRV_LOG(ERR, "Setup rxq[%d] rx_resources failed, dev_name:%s",
+               PMD_DRV_LOG(ERR, "Setup rxq[%d] rx_resources failed, dev_name: %s",
                            queue_idx, dev->data->name);
                goto setup_rx_res_err;
        }
@@ -579,7 +594,7 @@ static int hinic_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
        nic_dev->txqs[queue_idx] = txq;
 
        /* alloc tx sq hw wqepage */
-       rc = hinic_create_sq(hwdev, queue_idx, sq_depth);
+       rc = hinic_create_sq(hwdev, queue_idx, sq_depth, socket_id);
        if (rc) {
                PMD_DRV_LOG(ERR, "Create txq[%d] failed, dev_name: %s, sq_depth: %d",
                            queue_idx, dev->data->name, sq_depth);
@@ -598,6 +613,7 @@ static int hinic_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
        txq->sq_bot_sge_addr = HINIC_GET_WQ_TAIL(txq) -
                                        sizeof(struct hinic_sq_bufdesc);
        txq->cos = nic_dev->default_cos;
+       txq->socket_id = socket_id;
 
        /* alloc software txinfo */
        rc = hinic_setup_tx_resources(txq);
@@ -716,9 +732,10 @@ hinic_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
        info->max_tx_queues  = nic_dev->nic_cap.max_sqs;
        info->min_rx_bufsize = HINIC_MIN_RX_BUF_SIZE;
        info->max_rx_pktlen  = HINIC_MAX_JUMBO_FRAME_SIZE;
-       info->max_mac_addrs  = HINIC_MAX_MAC_ADDRS;
+       info->max_mac_addrs  = HINIC_MAX_UC_MAC_ADDRS;
        info->min_mtu = HINIC_MIN_MTU_SIZE;
        info->max_mtu = HINIC_MAX_MTU_SIZE;
+       info->max_lro_pkt_size = HINIC_MAX_LRO_SIZE;
 
        hinic_get_speed_capa(dev, &info->speed_capa);
        info->rx_queue_offload_capa = 0;
@@ -728,7 +745,9 @@ hinic_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
                                DEV_RX_OFFLOAD_TCP_CKSUM |
                                DEV_RX_OFFLOAD_VLAN_FILTER |
                                DEV_RX_OFFLOAD_SCATTER |
-                               DEV_RX_OFFLOAD_JUMBO_FRAME;
+                               DEV_RX_OFFLOAD_JUMBO_FRAME |
+                               DEV_RX_OFFLOAD_TCP_LRO |
+                               DEV_RX_OFFLOAD_RSS_HASH;
 
        info->tx_queue_offload_capa = 0;
        info->tx_offload_capa = DEV_TX_OFFLOAD_VLAN_INSERT |
@@ -746,6 +765,35 @@ hinic_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
        info->rx_desc_lim = hinic_rx_desc_lim;
        info->tx_desc_lim = hinic_tx_desc_lim;
 
+       /* Driver-preferred Rx/Tx parameters */
+       info->default_rxportconf.burst_size = HINIC_DEFAULT_BURST_SIZE;
+       info->default_txportconf.burst_size = HINIC_DEFAULT_BURST_SIZE;
+       info->default_rxportconf.nb_queues = HINIC_DEFAULT_NB_QUEUES;
+       info->default_txportconf.nb_queues = HINIC_DEFAULT_NB_QUEUES;
+       info->default_rxportconf.ring_size = HINIC_DEFAULT_RING_SIZE;
+       info->default_txportconf.ring_size = HINIC_DEFAULT_RING_SIZE;
+
+       return 0;
+}
+
+static int hinic_fw_version_get(struct rte_eth_dev *dev, char *fw_version,
+                               size_t fw_size)
+{
+       struct hinic_nic_dev *nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(dev);
+       char fw_ver[HINIC_MGMT_VERSION_MAX_LEN] = {0};
+       int err;
+
+       err = hinic_get_mgmt_version(nic_dev->hwdev, fw_ver);
+       if (err) {
+               PMD_DRV_LOG(ERR, "Failed to get fw version");
+               return -EINVAL;
+       }
+
+       if (fw_size < strlen(fw_ver) + 1)
+               return (strlen(fw_ver) + 1);
+
+       snprintf(fw_version, fw_size, "%s", fw_ver);
+
        return 0;
 }
 
@@ -763,11 +811,10 @@ static int hinic_config_rx_mode(struct hinic_nic_dev *nic_dev, u32 rx_mode_ctrl)
        return 0;
 }
 
-
 static int hinic_rxtx_configure(struct rte_eth_dev *dev)
 {
-       int err;
        struct hinic_nic_dev *nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(dev);
+       int err;
 
        /* rx configure, if rss enable, need to init default configuration */
        err = hinic_rx_configure(dev);
@@ -879,6 +926,66 @@ out:
        return rc;
 }
 
+/**
+ * DPDK callback to bring the link UP.
+ *
+ * @param dev
+ *   Pointer to Ethernet device structure.
+ *
+ * @return
+ *   0 on success, negative errno value on failure.
+ */
+static int hinic_dev_set_link_up(struct rte_eth_dev *dev)
+{
+       struct hinic_nic_dev *nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(dev);
+       int ret;
+
+       ret = hinic_set_xsfp_tx_status(nic_dev->hwdev, true);
+       if (ret) {
+               PMD_DRV_LOG(ERR, "Enable port tx xsfp failed, dev_name: %s, port_id: %d",
+                           nic_dev->proc_dev_name, dev->data->port_id);
+               return ret;
+       }
+
+       /* link status follow phy port status, up will open pma */
+       ret = hinic_set_port_enable(nic_dev->hwdev, true);
+       if (ret)
+               PMD_DRV_LOG(ERR, "Set mac link up failed, dev_name: %s, port_id: %d",
+                           nic_dev->proc_dev_name, dev->data->port_id);
+
+       return ret;
+}
+
+/**
+ * DPDK callback to bring the link DOWN.
+ *
+ * @param dev
+ *   Pointer to Ethernet device structure.
+ *
+ * @return
+ *   0 on success, negative errno value on failure.
+ */
+static int hinic_dev_set_link_down(struct rte_eth_dev *dev)
+{
+       struct hinic_nic_dev *nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(dev);
+       int ret;
+
+       ret = hinic_set_xsfp_tx_status(nic_dev->hwdev, false);
+       if (ret) {
+               PMD_DRV_LOG(ERR, "Disable port tx xsfp failed, dev_name: %s, port_id: %d",
+                           nic_dev->proc_dev_name, dev->data->port_id);
+               return ret;
+       }
+
+       /* link status follow phy port status, up will close pma */
+       ret = hinic_set_port_enable(nic_dev->hwdev, false);
+       if (ret)
+               PMD_DRV_LOG(ERR, "Set mac link down failed, dev_name: %s, port_id: %d",
+                           nic_dev->proc_dev_name, dev->data->port_id);
+
+       return ret;
+}
+
 /**
  * DPDK callback to start the device.
  *
@@ -907,7 +1014,7 @@ static int hinic_dev_start(struct rte_eth_dev *dev)
        /* init txq and rxq context */
        rc = hinic_init_qp_ctxts(nic_dev->hwdev);
        if (rc) {
-               PMD_DRV_LOG(ERR, "Initialize qp context failed, dev_name:%s",
+               PMD_DRV_LOG(ERR, "Initialize qp context failed, dev_name: %s",
                            name);
                goto init_qp_fail;
        }
@@ -949,7 +1056,7 @@ static int hinic_dev_start(struct rte_eth_dev *dev)
        /* open physical port and start packet receiving */
        rc = hinic_set_port_enable(nic_dev->hwdev, true);
        if (rc) {
-               PMD_DRV_LOG(ERR, "Enable physical port failed, dev_name:%s",
+               PMD_DRV_LOG(ERR, "Enable physical port failed, dev_name: %s",
                            name);
                goto en_port_fail;
        }
@@ -1004,7 +1111,7 @@ static void hinic_rx_queue_release(void *queue)
        nic_dev = rxq->nic_dev;
 
        /* free rxq_pkt mbuf */
-       hinic_free_all_rx_skbs(rxq);
+       hinic_free_all_rx_mbufs(rxq);
 
        /* free rxq_cqe, rxq_info */
        hinic_free_rx_resources(rxq);
@@ -1036,7 +1143,7 @@ static void hinic_tx_queue_release(void *queue)
        nic_dev = txq->nic_dev;
 
        /* free txq_pkt mbuf */
-       hinic_free_all_tx_skbs(txq);
+       hinic_free_all_tx_mbufs(txq);
 
        /* free txq_info */
        hinic_free_tx_resources(txq);
@@ -1091,12 +1198,12 @@ static void hinic_dev_stop(struct rte_eth_dev *dev)
        /* just stop phy port and vport */
        rc = hinic_set_port_enable(nic_dev->hwdev, false);
        if (rc)
-               PMD_DRV_LOG(WARNING, "Disable phy port failed, error: %d, dev_name:%s, port_id:%d",
+               PMD_DRV_LOG(WARNING, "Disable phy port failed, error: %d, dev_name: %s, port_id: %d",
                          rc, name, port_id);
 
        rc = hinic_set_vport_enable(nic_dev->hwdev, false);
        if (rc)
-               PMD_DRV_LOG(WARNING, "Disable vport failed, error: %d, dev_name:%s, port_id:%d",
+               PMD_DRV_LOG(WARNING, "Disable vport failed, error: %d, dev_name: %s, port_id: %d",
                          rc, name, port_id);
 
        /* Clear recorded link status */
@@ -1115,6 +1222,8 @@ static void hinic_dev_stop(struct rte_eth_dev *dev)
        /* clean root context */
        hinic_free_qp_ctxts(nic_dev->hwdev);
 
+       hinic_destroy_fdir_filter(dev);
+
        /* free mbuf */
        hinic_free_all_rx_mbuf(dev);
        hinic_free_all_tx_mbuf(dev);
@@ -1342,21 +1451,41 @@ static int hinic_init_mac_addr(struct rte_eth_dev *eth_dev)
        if (rc)
                return rc;
 
-       memmove(eth_dev->data->mac_addrs->addr_bytes,
-               addr_bytes, RTE_ETHER_ADDR_LEN);
-
-       if (rte_is_zero_ether_addr(eth_dev->data->mac_addrs))
-               hinic_gen_random_mac_addr(eth_dev->data->mac_addrs);
+       rte_ether_addr_copy((struct rte_ether_addr *)addr_bytes,
+               &eth_dev->data->mac_addrs[0]);
+       if (rte_is_zero_ether_addr(&eth_dev->data->mac_addrs[0]))
+               hinic_gen_random_mac_addr(&eth_dev->data->mac_addrs[0]);
 
        func_id = hinic_global_func_id(nic_dev->hwdev);
-       rc = hinic_set_mac(nic_dev->hwdev, eth_dev->data->mac_addrs->addr_bytes,
-                          0, func_id);
+       rc = hinic_set_mac(nic_dev->hwdev,
+                       eth_dev->data->mac_addrs[0].addr_bytes,
+                       0, func_id);
        if (rc && rc != HINIC_PF_SET_VF_ALREADY)
                return rc;
 
+       rte_ether_addr_copy(&eth_dev->data->mac_addrs[0],
+                       &nic_dev->default_addr);
+
        return 0;
 }
 
+static void hinic_delete_mc_addr_list(struct hinic_nic_dev *nic_dev)
+{
+       u16 func_id;
+       u32 i;
+
+       func_id = hinic_global_func_id(nic_dev->hwdev);
+
+       for (i = 0; i < HINIC_MAX_MC_MAC_ADDRS; i++) {
+               if (rte_is_zero_ether_addr(&nic_dev->mc_list[i]))
+                       break;
+
+               hinic_del_mac(nic_dev->hwdev, nic_dev->mc_list[i].addr_bytes,
+                             0, func_id);
+               memset(&nic_dev->mc_list[i], 0, sizeof(struct rte_ether_addr));
+       }
+}
+
 /**
  * Deinit mac_vlan table in NIC.
  *
@@ -1371,19 +1500,29 @@ static void hinic_deinit_mac_addr(struct rte_eth_dev *eth_dev)
 {
        struct hinic_nic_dev *nic_dev =
                                HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(eth_dev);
-       int rc;
        u16 func_id = 0;
-
-       if (rte_is_zero_ether_addr(eth_dev->data->mac_addrs))
-               return;
+       int rc;
+       int i;
 
        func_id = hinic_global_func_id(nic_dev->hwdev);
-       rc = hinic_del_mac(nic_dev->hwdev,
-                          eth_dev->data->mac_addrs->addr_bytes,
-                          0, func_id);
-       if (rc && rc != HINIC_PF_SET_VF_ALREADY)
-               PMD_DRV_LOG(ERR, "Delete mac table failed, dev_name: %s",
-                           eth_dev->data->name);
+
+       for (i = 0; i < HINIC_MAX_UC_MAC_ADDRS; i++) {
+               if (rte_is_zero_ether_addr(&eth_dev->data->mac_addrs[i]))
+                       continue;
+
+               rc = hinic_del_mac(nic_dev->hwdev,
+                                  eth_dev->data->mac_addrs[i].addr_bytes,
+                                  0, func_id);
+               if (rc && rc != HINIC_PF_SET_VF_ALREADY)
+                       PMD_DRV_LOG(ERR, "Delete mac table failed, dev_name: %s",
+                                   eth_dev->data->name);
+
+               memset(&eth_dev->data->mac_addrs[i], 0,
+                      sizeof(struct rte_ether_addr));
+       }
+
+       /* delete multicast mac addrs */
+       hinic_delete_mc_addr_list(nic_dev);
 }
 
 static int hinic_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
@@ -1694,6 +1833,76 @@ static int hinic_dev_promiscuous_disable(struct rte_eth_dev *dev)
        return rc;
 }
 
+static int hinic_flow_ctrl_get(struct rte_eth_dev *dev,
+                       struct rte_eth_fc_conf *fc_conf)
+{
+       struct hinic_nic_dev *nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(dev);
+       struct nic_pause_config nic_pause;
+       int err;
+
+       memset(&nic_pause, 0, sizeof(nic_pause));
+
+       err = hinic_get_pause_info(nic_dev->hwdev, &nic_pause);
+       if (err)
+               return err;
+
+       if (nic_dev->pause_set || !nic_pause.auto_neg) {
+               nic_pause.rx_pause = nic_dev->nic_pause.rx_pause;
+               nic_pause.tx_pause = nic_dev->nic_pause.tx_pause;
+       }
+
+       fc_conf->autoneg = nic_pause.auto_neg;
+
+       if (nic_pause.tx_pause && nic_pause.rx_pause)
+               fc_conf->mode = RTE_FC_FULL;
+       else if (nic_pause.tx_pause)
+               fc_conf->mode = RTE_FC_TX_PAUSE;
+       else if (nic_pause.rx_pause)
+               fc_conf->mode = RTE_FC_RX_PAUSE;
+       else
+               fc_conf->mode = RTE_FC_NONE;
+
+       return 0;
+}
+
+static int hinic_flow_ctrl_set(struct rte_eth_dev *dev,
+                       struct rte_eth_fc_conf *fc_conf)
+{
+       struct hinic_nic_dev *nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(dev);
+       struct nic_pause_config nic_pause;
+       int err;
+
+       nic_pause.auto_neg = fc_conf->autoneg;
+
+       if (((fc_conf->mode & RTE_FC_FULL) == RTE_FC_FULL) ||
+               (fc_conf->mode & RTE_FC_TX_PAUSE))
+               nic_pause.tx_pause = true;
+       else
+               nic_pause.tx_pause = false;
+
+       if (((fc_conf->mode & RTE_FC_FULL) == RTE_FC_FULL) ||
+               (fc_conf->mode & RTE_FC_RX_PAUSE))
+               nic_pause.rx_pause = true;
+       else
+               nic_pause.rx_pause = false;
+
+       err = hinic_set_pause_config(nic_dev->hwdev, nic_pause);
+       if (err)
+               return err;
+
+       nic_dev->pause_set = true;
+       nic_dev->nic_pause.auto_neg = nic_pause.auto_neg;
+       nic_dev->nic_pause.rx_pause = nic_pause.rx_pause;
+       nic_dev->nic_pause.tx_pause = nic_pause.tx_pause;
+
+       PMD_DRV_LOG(INFO, "Set pause options, tx: %s, rx: %s, auto: %s\n",
+               nic_pause.tx_pause ? "on" : "off",
+               nic_pause.rx_pause ? "on" : "off",
+               nic_pause.auto_neg ? "on" : "off");
+
+       return 0;
+}
+
 /**
  * DPDK callback to update the RSS hash key and RSS hash type.
  *
@@ -1722,7 +1931,7 @@ static int hinic_rss_hash_update(struct rte_eth_dev *dev,
        }
 
        if (rss_conf->rss_key_len > HINIC_RSS_KEY_SIZE) {
-               PMD_DRV_LOG(ERR, "Invalid rss key, rss_key_len:%d",
+               PMD_DRV_LOG(ERR, "Invalid rss key, rss_key_len: %d",
                            rss_conf->rss_key_len);
                return HINIC_ERROR;
        }
@@ -1843,7 +2052,7 @@ static int hinic_rss_indirtbl_update(struct rte_eth_dev *dev,
                return HINIC_OK;
 
        if (reta_size != NIC_RSS_INDIR_SIZE) {
-               PMD_DRV_LOG(ERR, "Invalid reta size, reta_size:%d", reta_size);
+               PMD_DRV_LOG(ERR, "Invalid reta size, reta_size: %d", reta_size);
                return HINIC_ERROR;
        }
 
@@ -1861,7 +2070,7 @@ static int hinic_rss_indirtbl_update(struct rte_eth_dev *dev,
 
        for (i = 0 ; i < reta_size; i++) {
                if (indirtbl[i] >= nic_dev->num_rq) {
-                       PMD_DRV_LOG(ERR, "Invalid reta entry, index:%d, num_rq:%d",
+                       PMD_DRV_LOG(ERR, "Invalid reta entry, index: %d, num_rq: %d",
                                    i, nic_dev->num_rq);
                        goto disable_rss;
                }
@@ -1908,13 +2117,13 @@ static int hinic_rss_indirtbl_query(struct rte_eth_dev *dev,
        u16 i = 0;
 
        if (reta_size != NIC_RSS_INDIR_SIZE) {
-               PMD_DRV_LOG(ERR, "Invalid reta size, reta_size:%d", reta_size);
+               PMD_DRV_LOG(ERR, "Invalid reta size, reta_size: %d", reta_size);
                return HINIC_ERROR;
        }
 
        err = hinic_rss_get_indir_tbl(nic_dev->hwdev, tmpl_idx, indirtbl);
        if (err) {
-               PMD_DRV_LOG(ERR, "Get rss indirect table failed, error:%d",
+               PMD_DRV_LOG(ERR, "Get rss indirect table failed, error: %d",
                            err);
                return err;
        }
@@ -2024,6 +2233,23 @@ static int hinic_dev_xstats_get(struct rte_eth_dev *dev,
        return count;
 }
 
+static void hinic_rxq_info_get(struct rte_eth_dev *dev, uint16_t queue_id,
+                               struct rte_eth_rxq_info *qinfo)
+{
+       struct hinic_rxq  *rxq = dev->data->rx_queues[queue_id];
+
+       qinfo->mp = rxq->mb_pool;
+       qinfo->nb_desc = rxq->q_depth;
+}
+
+static void hinic_txq_info_get(struct rte_eth_dev *dev, uint16_t queue_id,
+                               struct rte_eth_txq_info *qinfo)
+{
+       struct hinic_txq  *txq = dev->data->tx_queues[queue_id];
+
+       qinfo->nb_desc = txq->q_depth;
+}
+
 /**
  * DPDK callback to retrieve names of extended device statistics
  *
@@ -2091,16 +2317,228 @@ static int hinic_dev_xstats_get_names(struct rte_eth_dev *dev,
 
        return count;
 }
+/**
+ *  DPDK callback to set mac address
+ *
+ * @param dev
+ *   Pointer to Ethernet device structure.
+ * @param addr
+ *   Pointer to mac address
+ * @return
+ *   0 on success, negative error value otherwise.
+ */
+static int hinic_set_mac_addr(struct rte_eth_dev *dev,
+                             struct rte_ether_addr *addr)
+{
+       struct hinic_nic_dev *nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(dev);
+       u16 func_id;
+       int err;
+
+       func_id = hinic_global_func_id(nic_dev->hwdev);
+       err = hinic_update_mac(nic_dev->hwdev, nic_dev->default_addr.addr_bytes,
+                              addr->addr_bytes, 0, func_id);
+       if (err)
+               return err;
+
+       rte_ether_addr_copy(addr, &nic_dev->default_addr);
+
+       PMD_DRV_LOG(INFO, "Set new mac address %02x:%02x:%02x:%02x:%02x:%02x",
+                   addr->addr_bytes[0], addr->addr_bytes[1],
+                   addr->addr_bytes[2], addr->addr_bytes[3],
+                   addr->addr_bytes[4], addr->addr_bytes[5]);
+
+       return 0;
+}
+
+/**
+ * DPDK callback to remove a MAC address.
+ *
+ * @param dev
+ *   Pointer to Ethernet device structure.
+ * @param index
+ *   MAC address index, should less than 128.
+ */
+static void hinic_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index)
+{
+       struct hinic_nic_dev *nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(dev);
+       u16 func_id;
+       int ret;
+
+       if (index >= HINIC_MAX_UC_MAC_ADDRS) {
+               PMD_DRV_LOG(INFO, "Remove mac index(%u) is out of range",
+                           index);
+               return;
+       }
+
+       func_id = hinic_global_func_id(nic_dev->hwdev);
+       ret = hinic_del_mac(nic_dev->hwdev,
+                           dev->data->mac_addrs[index].addr_bytes, 0, func_id);
+       if (ret)
+               return;
+
+       memset(&dev->data->mac_addrs[index], 0, sizeof(struct rte_ether_addr));
+}
+
+/**
+ * DPDK callback to add a MAC address.
+ *
+ * @param dev
+ *   Pointer to Ethernet device structure.
+ * @param mac_addr
+ *   Pointer to MAC address
+ * @param index
+ *   MAC address index, should less than 128.
+ * @param vmdq
+ *   VMDq pool index(not used).
+ *
+ * @return
+ *   0 on success, negative error value otherwise.
+ */
+static int hinic_mac_addr_add(struct rte_eth_dev *dev,
+                             struct rte_ether_addr *mac_addr, uint32_t index,
+                             __rte_unused uint32_t vmdq)
+{
+       struct hinic_nic_dev  *nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(dev);
+       unsigned int i;
+       u16 func_id;
+       int ret;
+
+       if (index >= HINIC_MAX_UC_MAC_ADDRS) {
+               PMD_DRV_LOG(INFO, "Add mac index(%u) is out of range", index);
+               return -EINVAL;
+       }
+
+       /* First, make sure this address isn't already configured. */
+       for (i = 0; (i != HINIC_MAX_UC_MAC_ADDRS); ++i) {
+               /* Skip this index, it's going to be reconfigured. */
+               if (i == index)
+                       continue;
+
+               if (memcmp(&dev->data->mac_addrs[i],
+                       mac_addr, sizeof(*mac_addr)))
+                       continue;
+
+               PMD_DRV_LOG(INFO, "MAC address already configured");
+               return -EADDRINUSE;
+       }
+
+       func_id = hinic_global_func_id(nic_dev->hwdev);
+       ret = hinic_set_mac(nic_dev->hwdev, mac_addr->addr_bytes, 0, func_id);
+       if (ret)
+               return ret;
+
+       dev->data->mac_addrs[index] = *mac_addr;
+       return 0;
+}
+
+/**
+ *  DPDK callback to set multicast mac address
+ *
+ * @param dev
+ *   Pointer to Ethernet device structure.
+ * @param mc_addr_set
+ *   Pointer to multicast mac address
+ * @param nb_mc_addr
+ *   mc addr count
+ * @return
+ *   0 on success, negative error value otherwise.
+ */
+static int hinic_set_mc_addr_list(struct rte_eth_dev *dev,
+                                 struct rte_ether_addr *mc_addr_set,
+                                 uint32_t nb_mc_addr)
+{
+       struct hinic_nic_dev *nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(dev);
+       u16 func_id;
+       int ret;
+       u32 i;
+
+       func_id = hinic_global_func_id(nic_dev->hwdev);
+
+       /* delete old multi_cast addrs firstly */
+       hinic_delete_mc_addr_list(nic_dev);
+
+       if (nb_mc_addr > HINIC_MAX_MC_MAC_ADDRS)
+               goto allmulti;
+
+       for (i = 0; i < nb_mc_addr; i++) {
+               ret = hinic_set_mac(nic_dev->hwdev, mc_addr_set[i].addr_bytes,
+                                   0, func_id);
+               /* if add mc addr failed, set all multi_cast */
+               if (ret) {
+                       hinic_delete_mc_addr_list(nic_dev);
+                       goto allmulti;
+               }
+
+               rte_ether_addr_copy(&mc_addr_set[i], &nic_dev->mc_list[i]);
+       }
+
+       return 0;
+
+allmulti:
+       hinic_dev_allmulticast_enable(dev);
+
+       return 0;
+}
+
+/**
+ * DPDK callback to manage filter operations
+ *
+ * @param dev
+ *   Pointer to Ethernet device structure.
+ * @param filter_type
+ *   Filter type.
+ * @param filter_op
+ *   Operation to perform.
+ * @param arg
+ *   Pointer to operation-specific structure.
+ *
+ * @return
+ *   0 on success, negative errno value on failure.
+ */
+static int hinic_dev_filter_ctrl(struct rte_eth_dev *dev,
+                    enum rte_filter_type filter_type,
+                    enum rte_filter_op filter_op,
+                    void *arg)
+{
+       struct hinic_nic_dev *nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(dev);
+       int func_id = hinic_global_func_id(nic_dev->hwdev);
+
+       switch (filter_type) {
+       case RTE_ETH_FILTER_GENERIC:
+               if (filter_op != RTE_ETH_FILTER_GET)
+                       return -EINVAL;
+               *(const void **)arg = &hinic_flow_ops;
+               break;
+       default:
+               PMD_DRV_LOG(INFO, "Filter type (%d) not supported",
+                       filter_type);
+               return -EINVAL;
+       }
+
+       PMD_DRV_LOG(INFO, "Set filter_ctrl succeed, func_id: 0x%x, filter_type: 0x%x,"
+                       "filter_op: 0x%x.", func_id, filter_type, filter_op);
+       return 0;
+}
 
 static int hinic_set_default_pause_feature(struct hinic_nic_dev *nic_dev)
 {
        struct nic_pause_config pause_config = {0};
+       int err;
 
        pause_config.auto_neg = 0;
        pause_config.rx_pause = HINIC_DEFAUT_PAUSE_CONFIG;
        pause_config.tx_pause = HINIC_DEFAUT_PAUSE_CONFIG;
 
-       return hinic_set_pause_config(nic_dev->hwdev, pause_config);
+       err = hinic_set_pause_config(nic_dev->hwdev, pause_config);
+       if (err)
+               return err;
+
+       nic_dev->pause_set = true;
+       nic_dev->nic_pause.auto_neg = pause_config.auto_neg;
+       nic_dev->nic_pause.rx_pause = pause_config.rx_pause;
+       nic_dev->nic_pause.tx_pause = pause_config.tx_pause;
+
+       return 0;
 }
 
 static int hinic_set_default_dcb_feature(struct hinic_nic_dev *nic_dev)
@@ -2159,11 +2597,6 @@ static int hinic_set_default_hw_feature(struct hinic_nic_dev *nic_dev)
        if (err)
                return err;
 
-       /* disable LRO */
-       err = hinic_set_rx_lro(nic_dev->hwdev, 0, 0, (u8)0);
-       if (err)
-               return err;
-
        /* Set pause enable, and up will disable pfc. */
        err = hinic_set_default_pause_feature(nic_dev);
        if (err)
@@ -2515,9 +2948,12 @@ static void hinic_dev_close(struct rte_eth_dev *dev)
 static const struct eth_dev_ops hinic_pmd_ops = {
        .dev_configure                 = hinic_dev_configure,
        .dev_infos_get                 = hinic_dev_infos_get,
+       .fw_version_get                = hinic_fw_version_get,
        .rx_queue_setup                = hinic_rx_queue_setup,
        .tx_queue_setup                = hinic_tx_queue_setup,
        .dev_start                     = hinic_dev_start,
+       .dev_set_link_up               = hinic_dev_set_link_up,
+       .dev_set_link_down             = hinic_dev_set_link_down,
        .link_update                   = hinic_link_update,
        .rx_queue_release              = hinic_rx_queue_release,
        .tx_queue_release              = hinic_tx_queue_release,
@@ -2530,6 +2966,8 @@ static const struct eth_dev_ops hinic_pmd_ops = {
        .allmulticast_disable          = hinic_dev_allmulticast_disable,
        .promiscuous_enable            = hinic_dev_promiscuous_enable,
        .promiscuous_disable           = hinic_dev_promiscuous_disable,
+       .flow_ctrl_get                 = hinic_flow_ctrl_get,
+       .flow_ctrl_set                 = hinic_flow_ctrl_set,
        .rss_hash_update               = hinic_rss_hash_update,
        .rss_hash_conf_get             = hinic_rss_conf_get,
        .reta_update                   = hinic_rss_indirtbl_update,
@@ -2539,11 +2977,19 @@ static const struct eth_dev_ops hinic_pmd_ops = {
        .xstats_get                    = hinic_dev_xstats_get,
        .xstats_reset                  = hinic_dev_xstats_reset,
        .xstats_get_names              = hinic_dev_xstats_get_names,
+       .rxq_info_get                  = hinic_rxq_info_get,
+       .txq_info_get                  = hinic_txq_info_get,
+       .mac_addr_set                  = hinic_set_mac_addr,
+       .mac_addr_remove               = hinic_mac_addr_remove,
+       .mac_addr_add                  = hinic_mac_addr_add,
+       .set_mc_addr_list              = hinic_set_mc_addr_list,
+       .filter_ctrl                   = hinic_dev_filter_ctrl,
 };
 
 static const struct eth_dev_ops hinic_pmd_vf_ops = {
        .dev_configure                 = hinic_dev_configure,
        .dev_infos_get                 = hinic_dev_infos_get,
+       .fw_version_get                = hinic_fw_version_get,
        .rx_queue_setup                = hinic_rx_queue_setup,
        .tx_queue_setup                = hinic_tx_queue_setup,
        .dev_start                     = hinic_dev_start,
@@ -2566,6 +3012,13 @@ static const struct eth_dev_ops hinic_pmd_vf_ops = {
        .xstats_get                    = hinic_dev_xstats_get,
        .xstats_reset                  = hinic_dev_xstats_reset,
        .xstats_get_names              = hinic_dev_xstats_get_names,
+       .rxq_info_get                  = hinic_rxq_info_get,
+       .txq_info_get                  = hinic_txq_info_get,
+       .mac_addr_set                  = hinic_set_mac_addr,
+       .mac_addr_remove               = hinic_mac_addr_remove,
+       .mac_addr_add                  = hinic_mac_addr_add,
+       .set_mc_addr_list              = hinic_set_mc_addr_list,
+       .filter_ctrl                   = hinic_dev_filter_ctrl,
 };
 
 static int hinic_func_init(struct rte_eth_dev *eth_dev)
@@ -2573,20 +3026,19 @@ static int hinic_func_init(struct rte_eth_dev *eth_dev)
        struct rte_pci_device *pci_dev;
        struct rte_ether_addr *eth_addr;
        struct hinic_nic_dev *nic_dev;
+       struct hinic_filter_info *filter_info;
+       struct hinic_tcam_info *tcam_info;
+       u32 mac_size;
        int rc;
 
        pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
 
        /* EAL is SECONDARY and eth_dev is already created */
        if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
-               rc = rte_intr_callback_register(&pci_dev->intr_handle,
-                                               hinic_dev_interrupt_handler,
-                                               (void *)eth_dev);
-               if (rc)
-                       PMD_DRV_LOG(ERR, "Initialize %s failed in secondary process",
-                                   eth_dev->data->name);
+               PMD_DRV_LOG(INFO, "Initialize %s in secondary process",
+                           eth_dev->data->name);
 
-               return rc;
+               return 0;
        }
 
        nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(eth_dev);
@@ -2599,7 +3051,8 @@ static int hinic_func_init(struct rte_eth_dev *eth_dev)
                 pci_dev->addr.devid, pci_dev->addr.function);
 
        /* alloc mac_addrs */
-       eth_addr = rte_zmalloc("hinic_mac", sizeof(*eth_addr), 0);
+       mac_size = HINIC_MAX_UC_MAC_ADDRS * sizeof(struct rte_ether_addr);
+       eth_addr = rte_zmalloc("hinic_mac", mac_size, 0);
        if (!eth_addr) {
                PMD_DRV_LOG(ERR, "Allocate ethernet addresses' memory failed, dev_name: %s",
                            eth_dev->data->name);
@@ -2608,6 +3061,15 @@ static int hinic_func_init(struct rte_eth_dev *eth_dev)
        }
        eth_dev->data->mac_addrs = eth_addr;
 
+       mac_size = HINIC_MAX_MC_MAC_ADDRS * sizeof(struct rte_ether_addr);
+       nic_dev->mc_list = rte_zmalloc("hinic_mc", mac_size, 0);
+       if (!nic_dev->mc_list) {
+               PMD_DRV_LOG(ERR, "Allocate mcast address' memory failed, dev_name: %s",
+                           eth_dev->data->name);
+               rc = -ENOMEM;
+               goto mc_addr_fail;
+       }
+
        /*
         * Pass the information to the rte_eth_dev_close() that it should also
         * release the private port resources.
@@ -2653,6 +3115,19 @@ static int hinic_func_init(struct rte_eth_dev *eth_dev)
        }
        hinic_set_bit(HINIC_DEV_INTR_EN, &nic_dev->dev_status);
 
+       /* initialize filter info */
+       filter_info = &nic_dev->filter;
+       tcam_info = &nic_dev->tcam;
+       memset(filter_info, 0, sizeof(struct hinic_filter_info));
+       memset(tcam_info, 0, sizeof(struct hinic_tcam_info));
+       /* initialize 5tuple filter list */
+       TAILQ_INIT(&filter_info->fivetuple_list);
+       TAILQ_INIT(&tcam_info->tcam_list);
+       TAILQ_INIT(&nic_dev->filter_ntuple_list);
+       TAILQ_INIT(&nic_dev->filter_ethertype_list);
+       TAILQ_INIT(&nic_dev->filter_fdir_rule_list);
+       TAILQ_INIT(&nic_dev->hinic_flow_list);
+
        hinic_set_bit(HINIC_DEV_INIT, &nic_dev->dev_status);
        PMD_DRV_LOG(INFO, "Initialize %s in primary successfully",
                    eth_dev->data->name);
@@ -2672,6 +3147,10 @@ init_mac_fail:
        hinic_nic_dev_destroy(eth_dev);
 
 create_nic_dev_fail:
+       rte_free(nic_dev->mc_list);
+       nic_dev->mc_list = NULL;
+
+mc_addr_fail:
        rte_free(eth_addr);
        eth_dev->data->mac_addrs = NULL;
 
@@ -2716,6 +3195,8 @@ static int hinic_dev_uninit(struct rte_eth_dev *dev)
        dev->rx_pkt_burst = NULL;
        dev->tx_pkt_burst = NULL;
 
+       rte_free(nic_dev->mc_list);
+
        rte_free(dev->data->mac_addrs);
        dev->data->mac_addrs = NULL;
 
@@ -2725,7 +3206,6 @@ static int hinic_dev_uninit(struct rte_eth_dev *dev)
 static struct rte_pci_id pci_id_hinic_map[] = {
        { RTE_PCI_DEVICE(HINIC_HUAWEI_VENDOR_ID, HINIC_DEV_ID_PRD) },
        { RTE_PCI_DEVICE(HINIC_HUAWEI_VENDOR_ID, HINIC_DEV_ID_MEZZ_25GE) },
-       { RTE_PCI_DEVICE(HINIC_HUAWEI_VENDOR_ID, HINIC_DEV_ID_MEZZ_40GE) },
        { RTE_PCI_DEVICE(HINIC_HUAWEI_VENDOR_ID, HINIC_DEV_ID_MEZZ_100GE) },
        { RTE_PCI_DEVICE(HINIC_HUAWEI_VENDOR_ID, HINIC_DEV_ID_VF) },
        { RTE_PCI_DEVICE(HINIC_HUAWEI_VENDOR_ID, HINIC_DEV_ID_VF_HV) },