X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fhinic%2Fhinic_pmd_ethdev.c;h=2f0f33a8dadb2648bb0b8ca1aa77f296d5d15dd2;hb=39395b9d41aff5488db4924df94098abbe4d4e8c;hp=072fec339849f101ff8259888f16053b2f8e235a;hpb=8b945a7f7dcb688fada7ec8650b8a1f45252ea73;p=dpdk.git diff --git a/drivers/net/hinic/hinic_pmd_ethdev.c b/drivers/net/hinic/hinic_pmd_ethdev.c index 072fec3398..2f0f33a8da 100644 --- a/drivers/net/hinic/hinic_pmd_ethdev.c +++ b/drivers/net/hinic/hinic_pmd_ethdev.c @@ -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 */ @@ -57,6 +56,7 @@ #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. @@ -225,6 +225,8 @@ static const struct hinic_xstats_name_off hinic_txq_stats_strings[] = { {"copy_pkts", offsetof(struct hinic_txq_stats, cpy_pkts)}, {"rl_drop", offsetof(struct hinic_txq_stats, rl_drop)}, {"burst_pkts", offsetof(struct hinic_txq_stats, burst_pkts)}, + {"sge_len0", offsetof(struct hinic_txq_stats, sge_len0)}, + {"mbuf_null", offsetof(struct hinic_txq_stats, mbuf_null)}, }; #define HINIC_TXQ_XSTATS_NUM (sizeof(hinic_txq_stats_strings) / \ @@ -318,7 +320,8 @@ static int hinic_dev_configure(struct rte_eth_dev *dev) return -EINVAL; } - dev->data->dev_conf.rxmode.offloads |= DEV_RX_OFFLOAD_RSS_HASH; + 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 || @@ -346,12 +349,12 @@ 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*/ + /* clear fdir filter flag in function table */ hinic_free_fdir_filter(nic_dev); return HINIC_OK; @@ -437,8 +440,8 @@ 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); + /* alloc rx sq hw wqe page */ + 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); @@ -465,6 +468,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; @@ -475,7 +479,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; } @@ -592,7 +596,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); @@ -611,6 +615,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); @@ -732,6 +737,7 @@ hinic_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info) 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; @@ -781,7 +787,7 @@ static int hinic_fw_version_get(struct rte_eth_dev *dev, char *fw_version, err = hinic_get_mgmt_version(nic_dev->hwdev, fw_ver); if (err) { - PMD_DRV_LOG(ERR, "Failed to get fw version\n"); + PMD_DRV_LOG(ERR, "Failed to get fw version"); return -EINVAL; } @@ -807,12 +813,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); - bool lro_en; + int err; /* rx configure, if rss enable, need to init default configuration */ err = hinic_rx_configure(dev); @@ -829,18 +833,6 @@ static int hinic_rxtx_configure(struct rte_eth_dev *dev) goto set_rx_mode_fail; } - /* config lro */ - lro_en = dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_TCP_LRO ? - true : false; - - err = hinic_set_rx_lro(nic_dev->hwdev, lro_en, lro_en, - HINIC_LRO_WQE_NUM_DEFAULT); - if (err) { - PMD_DRV_LOG(ERR, "%s lro failed, err: %d", - lro_en ? "Enable" : "Disable", err); - goto set_rx_mode_fail; - } - return HINIC_OK; set_rx_mode_fail: @@ -1024,7 +1016,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; } @@ -1066,7 +1058,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; } @@ -1208,12 +1200,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 */ @@ -1232,7 +1224,7 @@ static void hinic_dev_stop(struct rte_eth_dev *dev) /* clean root context */ hinic_free_qp_ctxts(nic_dev->hwdev); - hinic_free_fdir_filter(nic_dev); + hinic_destroy_fdir_filter(dev); /* free mbuf */ hinic_free_all_rx_mbuf(dev); @@ -1537,8 +1529,9 @@ static void hinic_deinit_mac_addr(struct rte_eth_dev *eth_dev) static int hinic_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu) { - int ret = 0; struct hinic_nic_dev *nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(dev); + uint32_t frame_size; + int ret = 0; PMD_DRV_LOG(INFO, "Set port mtu, port_id: %d, mtu: %d, max_pkt_len: %d", dev->data->port_id, mtu, HINIC_MTU_TO_PKTLEN(mtu)); @@ -1556,7 +1549,15 @@ static int hinic_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu) } /* update max frame size */ - dev->data->dev_conf.rxmode.max_rx_pkt_len = HINIC_MTU_TO_PKTLEN(mtu); + frame_size = HINIC_MTU_TO_PKTLEN(mtu); + if (frame_size > RTE_ETHER_MAX_LEN) + dev->data->dev_conf.rxmode.offloads |= + DEV_RX_OFFLOAD_JUMBO_FRAME; + else + dev->data->dev_conf.rxmode.offloads &= + ~DEV_RX_OFFLOAD_JUMBO_FRAME; + + dev->data->dev_conf.rxmode.max_rx_pkt_len = frame_size; nic_dev->mtu_size = mtu; return ret; @@ -1843,6 +1844,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. * @@ -1871,7 +1942,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; } @@ -1964,12 +2035,12 @@ static int hinic_rss_conf_get(struct rte_eth_dev *dev, } /** - * DPDK callback to update the RETA indirection table. + * DPDK callback to update the RSS redirection table. * * @param dev * Pointer to Ethernet device structure. * @param reta_conf - * Pointer to RETA configuration structure array. + * Pointer to RSS reta configuration data. * @param reta_size * Size of the RETA table. * @@ -1992,7 +2063,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; } @@ -2004,16 +2075,16 @@ static int hinic_rss_indirtbl_update(struct rte_eth_dev *dev, for (i = 0; i < reta_size; i++) { idx = i / RTE_RETA_GROUP_SIZE; shift = i % RTE_RETA_GROUP_SIZE; - if (reta_conf[idx].mask & (1ULL << shift)) - indirtbl[i] = reta_conf[idx].reta[shift]; - } - 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", - i, nic_dev->num_rq); - goto disable_rss; + if (reta_conf[idx].reta[shift] >= nic_dev->num_rq) { + PMD_DRV_LOG(ERR, "Invalid reta entry, indirtbl[%d]: %d " + "exceeds the maximum rxq num: %d", i, + reta_conf[idx].reta[shift], nic_dev->num_rq); + return -EINVAL; } + + if (reta_conf[idx].mask & (1ULL << shift)) + indirtbl[i] = reta_conf[idx].reta[shift]; } err = hinic_rss_set_indir_tbl(nic_dev->hwdev, tmpl_idx, indirtbl); @@ -2031,14 +2102,13 @@ disable_rss: return HINIC_ERROR; } - /** - * DPDK callback to get the RETA indirection table. + * DPDK callback to get the RSS indirection table. * * @param dev * Pointer to Ethernet device structure. * @param reta_conf - * Pointer to RETA configuration structure array. + * Pointer to RSS reta configuration data. * @param reta_size * Size of the RETA table. * @@ -2057,13 +2127,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; } @@ -2238,8 +2308,7 @@ static int hinic_dev_xstats_get_names(struct rte_eth_dev *dev, for (i = 0; i < HINIC_VPORT_XSTATS_NUM; i++) { snprintf(xstats_names[count].name, sizeof(xstats_names[count].name), - "%s", - hinic_vport_stats_strings[i].name); + "%s", hinic_vport_stats_strings[i].name); count++; } @@ -2250,13 +2319,13 @@ static int hinic_dev_xstats_get_names(struct rte_eth_dev *dev, for (i = 0; i < HINIC_PHYPORT_XSTATS_NUM; i++) { snprintf(xstats_names[count].name, sizeof(xstats_names[count].name), - "%s", - hinic_phyport_stats_strings[i].name); + "%s", hinic_phyport_stats_strings[i].name); count++; } return count; } + /** * DPDK callback to set mac address * @@ -2282,7 +2351,7 @@ static int hinic_set_mac_addr(struct rte_eth_dev *dev, rte_ether_addr_copy(addr, &nic_dev->default_addr); - PMD_DRV_LOG(INFO, "Set new mac address %02x:%02x:%02x:%02x:%02x:%02x\n", + 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]); @@ -2296,7 +2365,7 @@ static int hinic_set_mac_addr(struct rte_eth_dev *dev, * @param dev * Pointer to Ethernet device structure. * @param index - * MAC address index. + * MAC address index, should less than 128. */ static void hinic_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index) { @@ -2325,16 +2394,15 @@ static void hinic_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index) * @param dev * Pointer to Ethernet device structure. * @param mac_addr - * MAC address to register. + * Pointer to MAC address * @param index - * MAC address index. + * MAC address index, should less than 128. * @param vmdq - * VMDq pool index to associate address with (ignored). + * VMDq pool index(not used). * * @return - * 0 on success, a negative errno value otherwise and rte_errno is set. + * 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) @@ -2345,7 +2413,7 @@ static int hinic_mac_addr_add(struct rte_eth_dev *dev, int ret; if (index >= HINIC_MAX_UC_MAC_ADDRS) { - PMD_DRV_LOG(INFO, "Add mac index(%u) is out of range,", index); + PMD_DRV_LOG(INFO, "Add mac index(%u) is out of range", index); return -EINVAL; } @@ -2422,19 +2490,19 @@ allmulti: } /** - * DPDK callback to manage filter operations + * DPDK callback to manage filter control operations * * @param dev * Pointer to Ethernet device structure. * @param filter_type - * Filter type. + * Filter type, which just supports generic type. * @param filter_op - * Operation to perform. + * Filter operation to perform. * @param arg * Pointer to operation-specific structure. * * @return - * 0 on success, negative errno value on failure. + * 0 on success, negative error value otherwise. */ static int hinic_dev_filter_ctrl(struct rte_eth_dev *dev, enum rte_filter_type filter_type, @@ -2464,12 +2532,22 @@ static int hinic_dev_filter_ctrl(struct rte_eth_dev *dev, 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) @@ -2732,8 +2810,12 @@ static int hinic_nic_dev_create(struct rte_eth_dev *eth_dev) } /* get nic capability */ - if (!hinic_support_nic(nic_dev->hwdev, &nic_dev->nic_cap)) + if (!hinic_support_nic(nic_dev->hwdev, &nic_dev->nic_cap)) { + PMD_DRV_LOG(ERR, "Hw doesn't support nic, dev_name: %s", + eth_dev->data->name); + rc = -EINVAL; goto nic_check_fail; + } /* init root cla and function table */ rc = hinic_init_nicio(nic_dev->hwdev); @@ -2897,6 +2979,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, @@ -2956,6 +3040,7 @@ static int hinic_func_init(struct rte_eth_dev *eth_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; @@ -2963,14 +3048,10 @@ static int hinic_func_init(struct rte_eth_dev *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); @@ -3049,9 +3130,12 @@ static int hinic_func_init(struct rte_eth_dev *eth_dev) /* 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); @@ -3135,7 +3219,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) },