net/bnxt: fail init when mbuf allocation fails

[dpdk.git] / drivers / net / enic / enic.h

diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index d51781d..d5493c9 100644 (file)
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -51,8 +51,6 @@
 /* Special Filter id for non-specific packet flagging. Don't change value */
 #define ENIC_MAGIC_FILTER_ID 0xffff
 
-#define ENICPMD_FDIR_MAX           64
-
 /*
  * Interrupt 0: LSC and errors
  * Interrupt 1: rx queue 0
@@ -62,23 +60,6 @@
 #define ENICPMD_LSC_INTR_OFFSET 0
 #define ENICPMD_RXQ_INTR_OFFSET 1
 
-struct enic_fdir_node {
-       struct rte_eth_fdir_filter filter;
-       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];
-       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);
-};
-
 struct enic_soft_stats {
        rte_atomic64_t rx_nombuf;
        rte_atomic64_t rx_packet_errors;
@@ -101,11 +82,11 @@ struct rte_flow {
        struct filter_v2 enic_filter;
        /* Data for flow manager based flow (enic_fm_flow.c) */
        struct enic_fm_flow *fm;
+       int internal;
 };
 
 /* Per-instance private data structure */
 struct enic {
-       struct enic *next;
        struct rte_pci_device *pdev;
        struct vnic_enet_config config;
        struct vnic_dev_bar bar0;
@@ -120,7 +101,6 @@ struct enic {
        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;
@@ -137,15 +117,18 @@ struct enic {
        uint8_t adv_filters;
        uint32_t flow_filter_mode;
        uint8_t filter_actions; /* HW supported actions */
+       uint64_t cq_entry_sizes; /* supported CQ entry sizes */
+       bool geneve;
        bool vxlan;
+       bool cq64;            /* actually using 64B CQ entry */
+       bool cq64_request;    /* devargs cq64=1 */
        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 geneve_port; /* current geneve port pushed to NIC */
        uint16_t vxlan_port;  /* current vxlan port pushed to NIC */
        int use_simple_tx_handler;
        int use_noscatter_vec_rx_handler;
@@ -195,7 +178,7 @@ struct enic {
         */
        uint8_t rss_hash_type; /* NIC_CFG_RSS_HASH_TYPE flags */
        uint8_t rss_enable;
-       uint64_t rss_hf; /* ETH_RSS flags */
+       uint64_t rss_hf; /* RTE_ETH_RSS flags */
        union vnic_rss_key rss_key;
        union vnic_rss_cpu rss_cpu;
 
@@ -210,6 +193,8 @@ struct enic {
 
        /* Flow manager API */
        struct enic_flowman *fm;
+       uint64_t fm_vnic_handle;
+       uint32_t fm_vnic_uif;
        /* switchdev */
        uint8_t switchdev_mode;
        uint16_t switch_domain_id;
@@ -241,6 +226,9 @@ struct enic_vf_representor {
        uint16_t pf_wq_cq_idx;   /* CQ for WQ */
        uint16_t pf_rq_sop_idx;  /* SOP RQ dedicated to VF rep */
        uint16_t pf_rq_data_idx; /* Data RQ */
+       /* Representor flows managed by flowman */
+       struct rte_flow *vf2rep_flow[2];
+       struct rte_flow *rep2vf_flow[2];
 };
 
 #define VF_ENIC_TO_VF_REP(vf_enic) \
@@ -290,10 +278,6 @@ static inline unsigned int enic_vnic_rq_count(struct enic *enic)
 
 static inline unsigned int enic_cq_rq(__rte_unused struct enic *enic, unsigned int rq)
 {
-       /* Scatter rx uses two receive queues together with one
-        * completion queue, so the completion queue number is no
-        * longer the same as the rq number.
-        */
        return rq;
 }
 
@@ -393,12 +377,6 @@ enic_ring_incr(uint32_t n_descriptors, uint32_t 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,
-                      struct rte_eth_fdir_filter *params);
-int enic_fdir_del_fltr(struct enic *enic,
-                      struct rte_eth_fdir_filter *params);
 void enic_free_wq(void *txq);
 int enic_alloc_intr_resources(struct enic *enic);
 int enic_setup_finish(struct enic *enic);
@@ -436,8 +414,6 @@ void enic_send_pkt(struct enic *enic, struct vnic_wq *wq,
 
 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,
@@ -446,6 +422,8 @@ 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_recv_pkts_64(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,
                                  uint16_t nb_pkts);
 uint16_t enic_dummy_recv_pkts(void *rx_queue,
@@ -462,11 +440,11 @@ 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);
+int enic_fm_add_rep2vf_flow(struct enic_vf_representor *vf);
+int enic_fm_add_vf2rep_flow(struct enic_vf_representor *vf);
 int enic_alloc_rx_queue_mbufs(struct enic *enic, struct vnic_rq *rq);
 void enic_rxmbuf_queue_release(struct enic *enic, struct vnic_rq *rq);
 void enic_free_wq_buf(struct rte_mbuf **buf);