X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fenic%2Fenic.h;h=929ea90a9616b845044a2ae13198954f1f8606ac;hb=39cf83f1771bd6b2050b7f3572a278bc2e58a1eb;hp=72b1e7956b489eb2bb99e725f670fdea4f220fa5;hpb=9039c8125730adfd46b8c891e7f205eb4ac43c67;p=dpdk.git diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h index 72b1e7956b..929ea90a96 100644 --- a/drivers/net/enic/enic.h +++ b/drivers/net/enic/enic.h @@ -6,8 +6,11 @@ #ifndef _ENIC_H_ #define _ENIC_H_ +#include +#include #include "vnic_enet.h" #include "vnic_dev.h" +#include "vnic_flowman.h" #include "vnic_wq.h" #include "vnic_rq.h" #include "vnic_cq.h" @@ -42,15 +45,14 @@ #define PCI_DEVICE_ID_CISCO_VIC_ENET 0x0043 /* ethernet vnic */ #define PCI_DEVICE_ID_CISCO_VIC_ENET_VF 0x0071 /* enet SRIOV VF */ +/* enet SRIOV Standalone vNic VF */ +#define PCI_DEVICE_ID_CISCO_VIC_ENET_SN 0x02B7 /* Special Filter id for non-specific packet flagging. Don't change value */ #define ENIC_MAGIC_FILTER_ID 0xffff #define ENICPMD_FDIR_MAX 64 -/* HW default VXLAN port */ -#define ENIC_DEFAULT_VXLAN_PORT 4789 - /* * Interrupt 0: LSC and errors * Interrupt 1: rx queue 0 @@ -62,16 +64,16 @@ struct enic_fdir_node { struct rte_eth_fdir_filter filter; - u16 fltr_id; - u16 rq_index; + uint16_t fltr_id; + uint16_t rq_index; }; struct enic_fdir { struct rte_eth_fdir_stats stats; struct rte_hash *hash; struct enic_fdir_node *nodes[ENICPMD_FDIR_MAX]; - u32 modes; - u32 types_mask; + uint32_t modes; + uint32_t types_mask; void (*copy_fltr_fn)(struct filter_v2 *filt, const struct rte_eth_fdir_input *input, const struct rte_eth_fdir_masks *masks); @@ -88,10 +90,17 @@ struct enic_memzone_entry { LIST_ENTRY(enic_memzone_entry) entries; }; +/* Defined in enic_fm_flow.c */ +struct enic_flowman; +struct enic_fm_flow; + struct rte_flow { LIST_ENTRY(rte_flow) next; - u16 enic_filter_id; + /* Data for filter API based flow (enic_flow.c) */ + uint16_t enic_filter_id; struct filter_v2 enic_filter; + /* Data for flow manager based flow (enic_fm_flow.c) */ + struct enic_fm_flow *fm; }; /* Per-instance private data structure */ @@ -110,30 +119,36 @@ struct enic { unsigned int port_id; bool overlay_offload; struct rte_eth_dev *rte_dev; + struct rte_eth_dev_data *dev_data; struct enic_fdir fdir; char bdf_name[ENICPMD_BDF_LENGTH]; int dev_fd; int iommu_group_fd; int iommu_groupid; int eventfd; - uint8_t mac_addr[ETH_ALEN]; + uint8_t mac_addr[RTE_ETHER_ADDR_LEN]; pthread_t err_intr_thread; int promisc; int allmulti; - u8 ig_vlan_strip_en; + uint8_t ig_vlan_strip_en; int link_status; - u8 hw_ip_checksum; - u16 max_mtu; - u8 adv_filters; - u32 flow_filter_mode; - u8 filter_actions; /* HW supported actions */ + uint8_t hw_ip_checksum; + uint16_t max_mtu; + uint8_t adv_filters; + uint32_t flow_filter_mode; + uint8_t filter_actions; /* HW supported actions */ bool vxlan; bool disable_overlay; /* devargs disable_overlay=1 */ uint8_t enable_avx2_rx; /* devargs enable-avx2-rx=1 */ + uint8_t geneve_opt_avail; /* Geneve with options offload available */ + uint8_t geneve_opt_enabled; /* Geneve with options offload enabled */ + uint8_t geneve_opt_request; /* devargs geneve-opt=1 */ bool nic_cfg_chk; /* NIC_CFG_CHK available */ bool udp_rss_weak; /* Bodega style UDP RSS */ uint8_t ig_vlan_rewrite_mode; /* devargs ig-vlan-rewrite */ uint16_t vxlan_port; /* current vxlan port pushed to NIC */ + int use_simple_tx_handler; + int use_noscatter_vec_rx_handler; unsigned int flags; unsigned int priv_flags; @@ -192,8 +207,41 @@ struct enic { /* Multicast MAC addresses added to the NIC */ uint32_t mc_count; struct rte_ether_addr mc_addrs[ENIC_MULTICAST_PERFECT_FILTERS]; + + /* Flow manager API */ + struct enic_flowman *fm; + /* switchdev */ + uint8_t switchdev_mode; + uint16_t switch_domain_id; + uint16_t max_vf_id; + /* + * Lock to serialize devcmds from PF, VF representors as they all share + * the same PF devcmd instance in firmware. + */ + rte_spinlock_t devcmd_lock; }; +struct enic_vf_representor { + struct enic enic; + struct vnic_enet_config config; + struct rte_eth_dev *eth_dev; + struct rte_ether_addr mac_addr; + struct rte_pci_addr bdf; + struct enic *pf; + uint16_t switch_domain_id; + uint16_t vf_id; + int allmulti; + int promisc; +}; + +#define VF_ENIC_TO_VF_REP(vf_enic) \ + container_of(vf_enic, struct enic_vf_representor, enic) + +static inline int enic_is_vf_rep(struct enic *enic) +{ + return !!(enic->rte_dev->data->dev_flags & RTE_ETH_DEV_REPRESENTOR); +} + /* Compute ethdev's max packet size from MTU */ static inline uint32_t enic_mtu_to_max_rx_pktlen(uint32_t mtu) { @@ -204,25 +252,26 @@ static inline uint32_t enic_mtu_to_max_rx_pktlen(uint32_t mtu) /* Get the CQ index from a Start of Packet(SOP) RQ index */ static inline unsigned int enic_sop_rq_idx_to_cq_idx(unsigned int sop_idx) { - return sop_idx / 2; + return sop_idx; } /* Get the RTE RQ index from a Start of Packet(SOP) RQ index */ static inline unsigned int enic_sop_rq_idx_to_rte_idx(unsigned int sop_idx) { - return sop_idx / 2; + return sop_idx; } /* Get the Start of Packet(SOP) RQ index from a RTE RQ index */ static inline unsigned int enic_rte_rq_idx_to_sop_idx(unsigned int rte_idx) { - return rte_idx * 2; + return rte_idx; } /* Get the Data RQ index from a RTE RQ index */ -static inline unsigned int enic_rte_rq_idx_to_data_idx(unsigned int rte_idx) +static inline unsigned int enic_rte_rq_idx_to_data_idx(unsigned int rte_idx, + struct enic *enic) { - return rte_idx * 2 + 1; + return enic->rq_count + rte_idx; } static inline unsigned int enic_vnic_rq_count(struct enic *enic) @@ -236,7 +285,7 @@ static inline unsigned int enic_cq_rq(__rte_unused struct enic *enic, unsigned i * completion queue, so the completion queue number is no * longer the same as the rq number. */ - return rq / 2; + return rq; } static inline unsigned int enic_cq_wq(struct enic *enic, unsigned int wq) @@ -273,6 +322,7 @@ enic_ring_incr(uint32_t n_descriptors, uint32_t idx) return idx; } +int dev_is_enic(struct rte_eth_dev *dev); void enic_fdir_stats_get(struct enic *enic, struct rte_eth_fdir_stats *stats); int enic_fdir_add_fltr(struct enic *enic, @@ -304,7 +354,7 @@ void enic_remove(struct enic *enic); int enic_get_link_status(struct enic *enic); int enic_dev_stats_get(struct enic *enic, struct rte_eth_stats *r_stats); -void enic_dev_stats_clear(struct enic *enic); +int enic_dev_stats_clear(struct enic *enic); int enic_add_packet_filter(struct enic *enic); int enic_set_mac_address(struct enic *enic, uint8_t *mac_addr); int enic_del_mac_address(struct enic *enic, int mac_index); @@ -318,6 +368,12 @@ void enic_post_wq_index(struct vnic_wq *wq); int enic_probe(struct enic *enic); int enic_clsf_init(struct enic *enic); void enic_clsf_destroy(struct enic *enic); +int enic_fm_init(struct enic *enic); +void enic_fm_destroy(struct enic *enic); +void *enic_alloc_consistent(void *priv, size_t size, dma_addr_t *dma_handle, + uint8_t *name); +void enic_free_consistent(void *priv, size_t size, void *vaddr, + dma_addr_t dma_handle); uint16_t enic_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts); uint16_t enic_noscatter_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, @@ -332,9 +388,16 @@ uint16_t enic_simple_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t enic_prep_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts); int enic_set_mtu(struct enic *enic, uint16_t new_mtu); -int enic_link_update(struct enic *enic); -bool enic_use_vector_rx_handler(struct enic *enic); +int enic_link_update(struct rte_eth_dev *eth_dev); +bool enic_use_vector_rx_handler(struct rte_eth_dev *eth_dev); +void enic_pick_rx_handler(struct rte_eth_dev *eth_dev); +void enic_pick_tx_handler(struct rte_eth_dev *eth_dev); void enic_fdir_info(struct enic *enic); void enic_fdir_info_get(struct enic *enic, struct rte_eth_fdir_info *stats); +int enic_vf_representor_init(struct rte_eth_dev *eth_dev, void *init_params); +int enic_vf_representor_uninit(struct rte_eth_dev *ethdev); +int enic_fm_allocate_switch_domain(struct enic *pf); extern const struct rte_flow_ops enic_flow_ops; +extern const struct rte_flow_ops enic_fm_flow_ops; + #endif /* _ENIC_H_ */