X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fi40e%2Fi40e_ethdev.h;h=a1ebdc093c9bd7c9ee202ce538cc76016d9ba00a;hb=c251b6a688bb0aba7d7a46154a3b238916ebd1a0;hp=d3bda02724d287de1439607fbfdb5171d9c227c0;hpb=febc61d350bf18fbe1b36123a873001a7ef3834d;p=dpdk.git diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h index d3bda02724..a1ebdc093c 100644 --- a/drivers/net/i40e/i40e_ethdev.h +++ b/drivers/net/i40e/i40e_ethdev.h @@ -6,6 +6,7 @@ #define _I40E_ETHDEV_H_ #include +#include #include #include @@ -16,8 +17,15 @@ #include "rte_pmd_i40e.h" #include "base/i40e_register.h" +#include "base/i40e_type.h" +#include "base/virtchnl.h" -#define I40E_VLAN_TAG_SIZE 4 +/** + * _i=0...143, + * counters 0-127 are for the 128 VFs, + * counters 128-143 are for the 16 PFs + */ +#define I40E_GL_RXERR1_H(_i) (0x00318004 + ((_i) * 8)) #define I40E_AQ_LEN 32 #define I40E_AQ_BUF_SZ 4096 @@ -88,8 +96,10 @@ do { \ uint32_t ori_val; \ struct rte_eth_dev *dev; \ + struct rte_eth_dev_data *dev_data; \ ori_val = I40E_READ_REG((hw), (reg)); \ - dev = ((struct i40e_adapter *)hw->back)->eth_dev; \ + dev_data = ((struct i40e_adapter *)hw->back)->pf.dev_data; \ + dev = &rte_eth_devices[dev_data->port_id]; \ I40E_PCI_REG_WRITE(I40E_PCI_REG_ADDR((hw), \ (reg)), (value)); \ if (ori_val != value) \ @@ -135,17 +145,17 @@ enum i40e_flxpld_layer_idx { I40E_FLAG_RSS_AQ_CAPABLE) #define I40E_RSS_OFFLOAD_ALL ( \ - ETH_RSS_FRAG_IPV4 | \ - ETH_RSS_NONFRAG_IPV4_TCP | \ - ETH_RSS_NONFRAG_IPV4_UDP | \ - ETH_RSS_NONFRAG_IPV4_SCTP | \ - ETH_RSS_NONFRAG_IPV4_OTHER | \ - ETH_RSS_FRAG_IPV6 | \ - ETH_RSS_NONFRAG_IPV6_TCP | \ - ETH_RSS_NONFRAG_IPV6_UDP | \ - ETH_RSS_NONFRAG_IPV6_SCTP | \ - ETH_RSS_NONFRAG_IPV6_OTHER | \ - ETH_RSS_L2_PAYLOAD) + RTE_ETH_RSS_FRAG_IPV4 | \ + RTE_ETH_RSS_NONFRAG_IPV4_TCP | \ + RTE_ETH_RSS_NONFRAG_IPV4_UDP | \ + RTE_ETH_RSS_NONFRAG_IPV4_SCTP | \ + RTE_ETH_RSS_NONFRAG_IPV4_OTHER | \ + RTE_ETH_RSS_FRAG_IPV6 | \ + RTE_ETH_RSS_NONFRAG_IPV6_TCP | \ + RTE_ETH_RSS_NONFRAG_IPV6_UDP | \ + RTE_ETH_RSS_NONFRAG_IPV6_SCTP | \ + RTE_ETH_RSS_NONFRAG_IPV6_OTHER | \ + RTE_ETH_RSS_L2_PAYLOAD) /* All bits of RSS hash enable for X722*/ #define I40E_RSS_HENA_ALL_X722 ( \ @@ -280,16 +290,31 @@ struct rte_flow { * Considering QinQ packet, the VLAN tag needs to be counted twice. */ #define I40E_ETH_OVERHEAD \ - (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + I40E_VLAN_TAG_SIZE * 2) + (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + RTE_VLAN_HLEN * 2) +#define I40E_ETH_MAX_LEN (RTE_ETHER_MTU + I40E_ETH_OVERHEAD) + +#define I40E_RXTX_BYTES_H_16_BIT(bytes) ((bytes) & ~I40E_48_BIT_MASK) +#define I40E_RXTX_BYTES_L_48_BIT(bytes) ((bytes) & I40E_48_BIT_MASK) struct i40e_adapter; struct rte_pci_driver; +/** + * MAC filter type + */ +enum i40e_mac_filter_type { + I40E_MAC_PERFECT_MATCH = 1, /**< exact match of MAC addr. */ + I40E_MACVLAN_PERFECT_MATCH, /**< exact match of MAC addr and VLAN ID. */ + I40E_MAC_HASH_MATCH, /**< hash match of MAC addr. */ + /** hash match of MAC addr and exact match of VLAN ID. */ + I40E_MACVLAN_HASH_MATCH, +}; + /** * MAC filter structure */ struct i40e_mac_filter_info { - enum rte_mac_filter_type filter_type; + enum i40e_mac_filter_type filter_type; struct rte_ether_addr mac_addr; }; @@ -344,7 +369,7 @@ struct i40e_veb { /* i40e MACVLAN filter structure */ struct i40e_macvlan_filter { struct rte_ether_addr macaddr; - enum rte_mac_filter_type filter_type; + enum i40e_mac_filter_type filter_type; uint16_t vlan_id; }; @@ -399,6 +424,8 @@ struct i40e_vsi { uint8_t vlan_anti_spoof_on; /* The VLAN anti-spoofing enabled */ uint8_t vlan_filter_on; /* The VLAN filter enabled */ struct i40e_bw_info bw_info; /* VSI bandwidth information */ + uint64_t prev_rx_bytes; + uint64_t prev_tx_bytes; }; struct pool_entry { @@ -594,19 +621,34 @@ enum i40e_fdir_ip_type { I40E_FDIR_IPTYPE_IPV6, }; +/** + * Structure to store flex pit for flow diretor. + */ +struct i40e_fdir_flex_pit { + uint8_t src_offset; /* offset in words from the beginning of payload */ + uint8_t size; /* size in words */ + uint8_t dst_offset; /* offset in words of flexible payload */ +}; + /* A structure used to contain extend input of flow */ struct i40e_fdir_flow_ext { uint16_t vlan_tci; uint8_t flexbytes[RTE_ETH_FDIR_MAX_FLEXLEN]; /* It is filled by the flexible payload to match. */ + uint8_t flex_mask[I40E_FDIR_MAX_FLEX_LEN]; + uint8_t raw_id; uint8_t is_vf; /* 1 for VF, 0 for port dev */ uint16_t dst_id; /* VF ID, available when is_vf is 1*/ + uint64_t input_set; bool inner_ip; /* If there is inner ip */ enum i40e_fdir_ip_type iip_type; /* ip type for inner ip */ enum i40e_fdir_ip_type oip_type; /* ip type for outer ip */ bool customized_pctype; /* If customized pctype is used */ bool pkt_template; /* If raw packet template is used */ bool is_udp; /* ipv4|ipv6 udp flow */ + enum i40e_flxpld_layer_idx layer_idx; + struct i40e_fdir_flex_pit flex_pit[I40E_MAX_FLXPLD_LAYER * I40E_MAX_FLXPLD_FIED]; + bool is_flex_flow; }; /* A structure used to define the input for a flow director filter entry */ @@ -648,8 +690,7 @@ struct i40e_fdir_action { }; /* A structure used to define the flow director filter entry by filter_ctrl API - * It supports RTE_ETH_FILTER_FDIR with RTE_ETH_FILTER_ADD and - * RTE_ETH_FILTER_DELETE operations. + * It supports RTE_ETH_FILTER_FDIR data representation. */ struct i40e_fdir_filter_conf { uint32_t soft_id; @@ -658,15 +699,6 @@ struct i40e_fdir_filter_conf { struct i40e_fdir_action action; /* Action taken when match */ }; -/* - * Structure to store flex pit for flow diretor. - */ -struct i40e_fdir_flex_pit { - uint8_t src_offset; /* offset in words from the beginning of payload */ - uint8_t size; /* size in words */ - uint8_t dst_offset; /* offset in words of flexible payload */ -}; - struct i40e_fdir_flex_mask { uint8_t word_mask; /**< Bit i enables word i of flexible payload */ uint8_t nb_bitmask; @@ -764,7 +796,9 @@ struct i40e_fdir_info { bool flex_pit_flag[I40E_MAX_FLXPLD_LAYER]; bool flex_mask_flag[I40E_FILTER_PCTYPE_MAX]; - bool inset_flag[I40E_FILTER_PCTYPE_MAX]; /* Mark if input set is set */ + uint32_t flow_count[I40E_FILTER_PCTYPE_MAX]; + + uint32_t flex_flow_count[I40E_MAX_FLXPLD_LAYER]; }; /* Ethertype filter number HW supports */ @@ -863,7 +897,7 @@ struct i40e_tunnel_filter { TAILQ_ENTRY(i40e_tunnel_filter) rules; struct i40e_tunnel_filter_input input; uint8_t is_to_vf; /* 0 - to PF, 1 - to VF */ - uint16_t vf_id; /* VF id, avaiblable when is_to_vf is 1. */ + uint16_t vf_id; /* VF id, available when is_to_vf is 1. */ uint16_t queue; /* Queue assigned to when match */ }; @@ -932,30 +966,9 @@ struct i40e_tunnel_filter_conf { uint32_t tenant_id; /**< Tenant ID to match. VNI, GRE key... */ uint16_t queue_id; /**< Queue assigned to if match. */ uint8_t is_to_vf; /**< 0 - to PF, 1 - to VF */ - uint16_t vf_id; /**< VF id, avaiblable when is_to_vf is 1. */ + uint16_t vf_id; /**< VF id, available when is_to_vf is 1. */ }; -#define I40E_MIRROR_MAX_ENTRIES_PER_RULE 64 -#define I40E_MAX_MIRROR_RULES 64 -/* - * Mirror rule structure - */ -struct i40e_mirror_rule { - TAILQ_ENTRY(i40e_mirror_rule) rules; - uint8_t rule_type; - uint16_t index; /* the sw index of mirror rule */ - uint16_t id; /* the rule id assigned by firmware */ - uint16_t dst_vsi_seid; /* destination vsi for this mirror rule. */ - uint16_t num_entries; - /* the info stores depend on the rule type. - If type is I40E_MIRROR_TYPE_VLAN, vlan ids are stored here. - If type is I40E_MIRROR_TYPE_VPORT_*, vsi's seid are stored. - */ - uint16_t entries[I40E_MIRROR_MAX_ENTRIES_PER_RULE]; -}; - -TAILQ_HEAD(i40e_mirror_rule_list, i40e_mirror_rule); - TAILQ_HEAD(i40e_flow_list, rte_flow); /* Struct to store Traffic Manager shaper profile. */ @@ -1043,16 +1056,32 @@ struct i40e_customized_pctype { }; struct i40e_rte_flow_rss_conf { - struct rte_flow_action_rss conf; /**< RSS parameters. */ - uint16_t queue_region_conf; /**< Queue region config flag */ + struct rte_flow_action_rss conf; /**< RSS parameters. */ + uint8_t key[(I40E_VFQF_HKEY_MAX_INDEX > I40E_PFQF_HKEY_MAX_INDEX ? I40E_VFQF_HKEY_MAX_INDEX : I40E_PFQF_HKEY_MAX_INDEX + 1) * - sizeof(uint32_t)]; /* Hash key. */ - uint16_t queue[I40E_MAX_Q_PER_TC]; /**< Queues indices to use. */ - bool valid; /* Check if it's valid */ -}; + sizeof(uint32_t)]; /**< Hash key. */ + uint16_t queue[RTE_ETH_RSS_RETA_SIZE_512]; /**< Queues indices to use. */ -TAILQ_HEAD(i40e_rss_conf_list, i40e_rss_filter); + bool symmetric_enable; /**< true, if enable symmetric */ + uint64_t config_pctypes; /**< All PCTYPES with the flow */ + uint64_t inset; /**< input sets */ + + uint8_t region_priority; /**< queue region priority */ + uint8_t region_queue_num; /**< region queue number */ + uint16_t region_queue_start; /**< region queue start */ + + uint32_t misc_reset_flags; +#define I40E_HASH_FLOW_RESET_FLAG_FUNC 0x01UL +#define I40E_HASH_FLOW_RESET_FLAG_KEY 0x02UL +#define I40E_HASH_FLOW_RESET_FLAG_QUEUE 0x04UL +#define I40E_HASH_FLOW_RESET_FLAG_REGION 0x08UL + + /**< All PCTYPES that reset with the flow */ + uint64_t reset_config_pctypes; + /**< Symmetric function should reset on PCTYPES */ + uint64_t reset_symmetric_pctypes; +}; /* RSS filter list structure */ struct i40e_rss_filter { @@ -1060,6 +1089,8 @@ struct i40e_rss_filter { struct i40e_rte_flow_rss_conf rss_filter_info; }; +TAILQ_HEAD(i40e_rss_conf_list, i40e_rss_filter); + struct i40e_vf_msg_cfg { /* maximal VF message during a statistic period */ uint32_t max_msg; @@ -1069,7 +1100,7 @@ struct i40e_vf_msg_cfg { /* * If message statistics from a VF exceed the maximal limitation, * the PF will ignore any new message from that VF for - * 'ignor_second' time. + * 'ignore_second' time. */ uint32_t ignore_second; }; @@ -1088,6 +1119,9 @@ struct i40e_pf { struct i40e_hw_port_stats stats_offset; struct i40e_hw_port_stats stats; + u64 rx_err1; /* rxerr1 */ + u64 rx_err1_offset; + /* internal packet statistics, it should be excluded from the total */ struct i40e_eth_stats internal_stats_offset; struct i40e_eth_stats internal_stats; @@ -1114,6 +1148,8 @@ struct i40e_pf { uint16_t fdir_qp_offset; uint16_t hash_lut_size; /* The size of hash lookup table */ + bool hash_filter_enabled; + uint64_t hash_enabled_queues; /* input set bits for each pctype */ uint64_t hash_input_set[I40E_FILTER_PCTYPE_MAX]; /* store VXLAN UDP ports */ @@ -1128,12 +1164,9 @@ struct i40e_pf { struct i40e_fdir_info fdir; /* flow director info */ struct i40e_ethertype_rule ethertype; /* Ethertype filter rule */ struct i40e_tunnel_rule tunnel; /* Tunnel filter rule */ - struct i40e_rte_flow_rss_conf rss_info; /* RSS info */ struct i40e_rss_conf_list rss_config_list; /* RSS rule list */ struct i40e_queue_regions queue_region; /* queue region info */ struct i40e_fc_conf fc_conf; /* Flow control conf */ - struct i40e_mirror_rule_list mirror_list; - uint16_t nb_mirror_rule; /* The number of mirror rules */ bool floating_veb; /* The flag to use the floating VEB */ /* The floating enable flag for the specific VF */ bool floating_veb_list[I40E_MAX_VF]; @@ -1156,6 +1189,10 @@ struct i40e_pf { uint16_t switch_domain_id; struct i40e_vf_msg_cfg vf_msg_cfg; + uint64_t prev_rx_bytes; + uint64_t prev_tx_bytes; + uint64_t internal_prev_rx_bytes; + uint64_t internal_prev_tx_bytes; }; enum pending_msg { @@ -1178,54 +1215,6 @@ struct i40e_vsi_vlan_pvid_info { } config; }; -struct i40e_vf_rx_queues { - uint64_t rx_dma_addr; - uint32_t rx_ring_len; - uint32_t buff_size; -}; - -struct i40e_vf_tx_queues { - uint64_t tx_dma_addr; - uint32_t tx_ring_len; -}; - -/* - * Structure to store private data specific for VF instance. - */ -struct i40e_vf { - struct i40e_adapter *adapter; /* The adapter this VF associate to */ - struct rte_eth_dev_data *dev_data; /* Pointer to the device data */ - uint16_t num_queue_pairs; - uint16_t max_pkt_len; /* Maximum packet length */ - bool promisc_unicast_enabled; - bool promisc_multicast_enabled; - - uint32_t version_major; /* Major version number */ - uint32_t version_minor; /* Minor version number */ - uint16_t promisc_flags; /* Promiscuous setting */ - uint32_t vlan[I40E_VFTA_SIZE]; /* VLAN bit map */ - - /* Multicast addrs */ - struct rte_ether_addr mc_addrs[I40E_NUM_MACADDR_MAX]; - uint16_t mc_addrs_num; /* Multicast mac addresses number */ - - /* Event from pf */ - bool dev_closed; - bool link_up; - enum virtchnl_link_speed link_speed; - bool vf_reset; - volatile uint32_t pend_cmd; /* pending command not finished yet */ - int32_t cmd_retval; /* return value of the cmd response from PF */ - u16 pend_msg; /* flags indicates events from pf not handled yet */ - uint8_t *aq_resp; /* buffer to store the adminq response from PF */ - - /* VSI info */ - struct virtchnl_vf_resource *vf_res; /* All VSIs */ - struct virtchnl_vsi_resource *vsi_res; /* LAN VSI */ - struct i40e_vsi vsi; - uint64_t flags; -}; - #define I40E_MAX_PKT_TYPE 256 #define I40E_FLOW_TYPE_MAX 64 @@ -1235,13 +1224,9 @@ struct i40e_vf { struct i40e_adapter { /* Common for both PF and VF */ struct i40e_hw hw; - struct rte_eth_dev *eth_dev; - /* Specific for PF or VF */ - union { - struct i40e_pf pf; - struct i40e_vf vf; - }; + /* Specific for PF */ + struct i40e_pf pf; /* For vector PMD */ bool rx_bulk_alloc_allowed; @@ -1261,15 +1246,18 @@ struct i40e_adapter { uint64_t flow_types_mask; uint64_t pctypes_mask; - /* For devargs */ - uint8_t use_latest_vec; - /* For RSS reta table update */ uint8_t rss_reta_updated; +#ifdef RTE_ARCH_X86 + bool rx_use_avx2; + bool rx_use_avx512; + bool tx_use_avx2; + bool tx_use_avx512; +#endif }; /** - * Strucute to store private data for each VF representor instance + * Structure to store private data for each VF representor instance */ struct i40e_vf_representor { uint16_t switch_domain_id; @@ -1277,7 +1265,7 @@ struct i40e_vf_representor { uint16_t vf_id; /**< Virtual Function ID */ struct i40e_adapter *adapter; - /**< Private data store of assocaiated physical function */ + /**< Private data store of associated physical function */ struct i40e_eth_stats stats_offset; /**< Zero-point of VF statistics*/ }; @@ -1319,8 +1307,9 @@ void i40e_update_vsi_stats(struct i40e_vsi *vsi); void i40e_pf_disable_irq0(struct i40e_hw *hw); void i40e_pf_enable_irq0(struct i40e_hw *hw); int i40e_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete); -void i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t itr_idx); +int i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t itr_idx); void i40e_vsi_queues_unbind_intr(struct i40e_vsi *vsi); +void i40e_vsi_disable_queues_intr(struct i40e_vsi *vsi); int i40e_vsi_vlan_pvid_set(struct i40e_vsi *vsi, struct i40e_vsi_vlan_pvid_info *info); int i40e_vsi_config_vlan_stripping(struct i40e_vsi *vsi, bool on); @@ -1330,6 +1319,7 @@ uint64_t i40e_parse_hena(const struct i40e_adapter *adapter, uint64_t flags); enum i40e_status_code i40e_fdir_setup_tx_resources(struct i40e_pf *pf); enum i40e_status_code i40e_fdir_setup_rx_resources(struct i40e_pf *pf); int i40e_fdir_setup(struct i40e_pf *pf); +void i40e_vsi_enable_queues_intr(struct i40e_vsi *vsi); const struct rte_memzone *i40e_memzone_reserve(const char *name, uint32_t len, int socket_id); @@ -1346,17 +1336,12 @@ void i40e_fdir_info_get(struct rte_eth_dev *dev, struct rte_eth_fdir_info *fdir); void i40e_fdir_stats_get(struct rte_eth_dev *dev, struct rte_eth_fdir_stats *stat); -int i40e_fdir_ctrl_func(struct rte_eth_dev *dev, - enum rte_filter_op filter_op, - void *arg); int i40e_select_filter_input_set(struct i40e_hw *hw, struct rte_eth_input_set_conf *conf, enum rte_filter_type filter); void i40e_fdir_filter_restore(struct i40e_pf *pf); -int i40e_hash_filter_inset_select(struct i40e_hw *hw, - struct rte_eth_input_set_conf *conf); -int i40e_fdir_filter_inset_select(struct i40e_pf *pf, - struct rte_eth_input_set_conf *conf); +int i40e_set_hash_inset(struct i40e_hw *hw, uint64_t input_set, + uint32_t pctype, bool add); int i40e_pf_host_send_msg_to_vf(struct i40e_pf_vf *vf, uint32_t opcode, uint32_t retval, uint8_t *msg, uint16_t msglen); @@ -1384,9 +1369,6 @@ uint64_t i40e_get_default_input_set(uint16_t pctype); int i40e_ethertype_filter_set(struct i40e_pf *pf, struct rte_eth_ethertype_filter *filter, bool add); -int i40e_add_del_fdir_filter(struct rte_eth_dev *dev, - const struct rte_eth_fdir_filter *filter, - bool add); struct rte_flow * i40e_fdir_entry_pool_get(struct i40e_fdir_info *fdir_info); void i40e_fdir_entry_pool_put(struct i40e_fdir_info *fdir_info, @@ -1413,12 +1395,12 @@ int i40e_add_macvlan_filters(struct i40e_vsi *vsi, int total); bool is_device_supported(struct rte_eth_dev *dev, struct rte_pci_driver *drv); bool is_i40e_supported(struct rte_eth_dev *dev); -bool is_i40evf_supported(struct rte_eth_dev *dev); - +void i40e_set_symmetric_hash_enable_per_port(struct i40e_hw *hw, + uint8_t enable); int i40e_validate_input_set(enum i40e_filter_pctype pctype, enum rte_filter_type filter, uint64_t inset); -int i40e_generate_inset_mask_reg(uint64_t inset, uint32_t *mask, - uint8_t nb_elem); +int i40e_generate_inset_mask_reg(struct i40e_hw *hw, uint64_t inset, + uint32_t *mask, uint8_t nb_elem); uint64_t i40e_translate_input_set_reg(enum i40e_mac_type type, uint64_t input); void i40e_check_write_reg(struct i40e_hw *hw, uint32_t addr, uint32_t val); void i40e_check_write_global_reg(struct i40e_hw *hw, @@ -1437,12 +1419,13 @@ int i40e_flush_queue_region_all_conf(struct rte_eth_dev *dev, struct i40e_hw *hw, struct i40e_pf *pf, uint16_t on); void i40e_init_queue_region_conf(struct rte_eth_dev *dev); void i40e_flex_payload_reg_set_default(struct i40e_hw *hw); +void i40e_pf_disable_rss(struct i40e_pf *pf); +int i40e_pf_calc_configured_queues_num(struct i40e_pf *pf); +int i40e_pf_reset_rss_reta(struct i40e_pf *pf); +int i40e_pf_reset_rss_key(struct i40e_pf *pf); +int i40e_pf_config_rss(struct i40e_pf *pf); int i40e_set_rss_key(struct i40e_vsi *vsi, uint8_t *key, uint8_t key_len); int i40e_set_rss_lut(struct i40e_vsi *vsi, uint8_t *lut, uint16_t lut_size); -int i40e_rss_conf_init(struct i40e_rte_flow_rss_conf *out, - const struct rte_flow_action_rss *in); -int i40e_config_rss_filter(struct i40e_pf *pf, - struct i40e_rte_flow_rss_conf *conf, bool add); int i40e_vf_representor_init(struct rte_eth_dev *ethdev, void *init_params); int i40e_vf_representor_uninit(struct rte_eth_dev *ethdev); @@ -1457,26 +1440,15 @@ int i40e_vf_representor_uninit(struct rte_eth_dev *ethdev); #define I40E_DEV_PRIVATE_TO_ADAPTER(adapter) \ ((struct i40e_adapter *)adapter) -/* I40EVF_DEV_PRIVATE_TO */ -#define I40EVF_DEV_PRIVATE_TO_VF(adapter) \ - (&((struct i40e_adapter *)adapter)->vf) - static inline struct i40e_vsi * i40e_get_vsi_from_adapter(struct i40e_adapter *adapter) { - struct i40e_hw *hw; - if (!adapter) return NULL; - hw = I40E_DEV_PRIVATE_TO_HW(adapter); - if (hw->mac.type == I40E_MAC_VF || hw->mac.type == I40E_MAC_X722_VF) { - struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(adapter); - return &vf->vsi; - } else { - struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(adapter); - return pf->main_vsi; - } + struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(adapter); + + return pf->main_vsi; } #define I40E_DEV_PRIVATE_TO_MAIN_VSI(adapter) \ i40e_get_vsi_from_adapter((struct i40e_adapter *)adapter) @@ -1491,7 +1463,7 @@ i40e_get_vsi_from_adapter(struct i40e_adapter *adapter) #define I40E_VSI_TO_DEV_DATA(vsi) \ (((struct i40e_vsi *)vsi)->adapter->pf.dev_data) #define I40E_VSI_TO_ETH_DEV(vsi) \ - (((struct i40e_vsi *)vsi)->adapter->eth_dev) + (&rte_eth_devices[((struct i40e_vsi *)vsi)->adapter->pf.dev_data->port_id]) /* I40E_PF_TO */ #define I40E_PF_TO_HW(pf) \ @@ -1499,10 +1471,6 @@ i40e_get_vsi_from_adapter(struct i40e_adapter *adapter) #define I40E_PF_TO_ADAPTER(pf) \ ((struct i40e_adapter *)pf->adapter) -/* I40E_VF_TO */ -#define I40E_VF_TO_HW(vf) \ - (&(((struct i40e_vf *)vf)->adapter->hw)) - static inline void i40e_init_adminq_parameter(struct i40e_hw *hw) {