X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fcxgbe%2Fbase%2Fadapter.h;h=1c016a71151fd97e4281907e5640e30dbb09a4bd;hb=75315881c23f3aa7c04fb19c50915e64dd97bd38;hp=db654ad9cd60106747b14036e0fcf7a953916787;hpb=97e02581a15bade3f3f943cd16a965a577746006;p=dpdk.git diff --git a/drivers/net/cxgbe/base/adapter.h b/drivers/net/cxgbe/base/adapter.h index db654ad9cd..1c016a7115 100644 --- a/drivers/net/cxgbe/base/adapter.h +++ b/drivers/net/cxgbe/base/adapter.h @@ -12,14 +12,13 @@ #include #include #include -#include +#include #include "../cxgbe_compat.h" #include "../cxgbe_ofld.h" #include "t4_regs_values.h" enum { - MAX_ETH_QSETS = 64, /* # of Ethernet Tx/Rx queue sets */ MAX_CTRL_QUEUES = NCHAN, /* # of control Tx queues */ }; @@ -40,28 +39,29 @@ struct port_info { short int xact_addr_filt; /* index of exact MAC address filter */ u16 viid; /* associated virtual interface id */ - s8 mdio_addr; /* address of the PHY */ - u8 port_type; /* firmware port type */ - u8 mod_type; /* firmware module type */ u8 port_id; /* physical port ID */ u8 pidx; /* port index for this PF */ u8 tx_chan; /* associated channel */ - u8 n_rx_qsets; /* # of rx qsets */ - u8 n_tx_qsets; /* # of tx qsets */ - u8 first_qset; /* index of first qset */ + u16 n_rx_qsets; /* # of rx qsets */ + u16 n_tx_qsets; /* # of tx qsets */ + u16 first_rxqset; /* index of first rxqset */ + u16 first_txqset; /* index of first txqset */ u16 *rss; /* rss table */ u8 rss_mode; /* rss mode */ u16 rss_size; /* size of VI's RSS table slice */ u64 rss_hf; /* RSS Hash Function */ -}; -/* Enable or disable autonegotiation. If this is set to enable, - * the forced link modes above are completely ignored. - */ -#define AUTONEG_DISABLE 0x00 -#define AUTONEG_ENABLE 0x01 + /* viid fields either returned by fw + * or decoded by parsing viid by driver. + */ + u8 vin; + u8 vivld; + + u8 vi_en_rx; /* Enable/disable VI Rx */ + u8 vi_en_tx; /* Enable/disable VI Tx */ +}; enum { /* adapter flags */ FULL_INIT_DONE = (1 << 0), @@ -98,6 +98,7 @@ struct sge_fl { /* SGE free-buffer queue state */ unsigned long alloc_failed; /* # of times buffer allocation failed */ unsigned long low; /* # of times momentarily starving */ + u8 fl_buf_size_idx; /* Selected SGE_FL_BUFFER_SIZE index */ }; #define MAX_MBUF_FRAGS (16384 / 512 + 2) @@ -110,7 +111,6 @@ struct pkt_gl { void *va; /* virtual address of first byte */ unsigned int nfrags; /* # of fragments */ unsigned int tot_len; /* total length of fragments */ - bool usembufs; /* use mbufs for fragments */ }; typedef int (*rspq_handler_t)(struct sge_rspq *q, const __be64 *rsp, @@ -156,10 +156,10 @@ struct sge_eth_rx_stats { /* Ethernet rx queue statistics */ }; struct sge_eth_rxq { /* a SW Ethernet Rx queue */ + unsigned int flags; /* flags for state of the queue */ struct sge_rspq rspq; struct sge_fl fl; struct sge_eth_rx_stats stats; - bool usembufs; /* one ingress packet per mbuf FL buffer */ } __rte_cache_aligned; /* @@ -193,10 +193,14 @@ struct tx_sw_desc { /* SW state per Tx descriptor */ struct tx_eth_coal_desc coalesce; }; -enum { +enum cxgbe_txq_state { EQ_STOPPED = (1 << 0), }; +enum cxgbe_rxq_state { + IQ_STOPPED = (1 << 0), +}; + struct eth_coalesce { unsigned char *ptr; unsigned char type; @@ -268,8 +272,8 @@ struct sge_ctrl_txq { /* State for an SGE control Tx queue */ } __rte_cache_aligned; struct sge { - struct sge_eth_txq ethtxq[MAX_ETH_QSETS]; - struct sge_eth_rxq ethrxq[MAX_ETH_QSETS]; + struct sge_eth_txq *ethtxq; + struct sge_eth_rxq *ethrxq; struct sge_rspq fw_evtq __rte_cache_aligned; struct sge_ctrl_txq ctrlq[MAX_CTRL_QUEUES]; @@ -281,13 +285,10 @@ struct sge { u16 timer_val[SGE_NTIMERS]; u8 counter_val[SGE_NCOUNTERS]; - u32 fl_align; /* response queue message alignment */ - u32 fl_pg_order; /* large page allocation size */ u32 fl_starve_thres; /* Free List starvation threshold */ + u32 fl_buffer_size[SGE_FL_BUFFER_SIZE_NUM]; /* Free List buffer sizes */ }; -#define T4_OS_NEEDS_MBOX_LOCKING 1 - /* * OS Lock/List primitives for those interfaces in the Common Code which * need this. @@ -303,6 +304,8 @@ struct adapter_devargs { bool keep_ovlan; bool force_link_up; bool tx_mode_latency; + u32 filtermode; + u32 filtermask; }; struct adapter { @@ -336,6 +339,7 @@ struct adapter { unsigned int l2t_end; /* Layer 2 table end */ struct clip_tbl *clipt; /* CLIP table */ struct l2t_data *l2t; /* Layer 2 table */ + struct smt_data *smt; /* Source mac table */ struct mpstcam_table *mpstcam; struct tid_info tids; /* Info used to access TID related tables */ @@ -787,7 +791,7 @@ void t4_free_mem(void *addr); #define t4_os_free(_ptr) t4_free_mem((_ptr)) void t4_os_portmod_changed(const struct adapter *adap, int port_id); -void t4_os_link_changed(struct adapter *adap, int port_id, int link_stat); +void t4_os_link_changed(struct adapter *adap, int port_id); void reclaim_completed_tx(struct sge_txq *q); void t4_free_sge_resources(struct adapter *adap); @@ -812,10 +816,11 @@ int t4_sge_alloc_rxq(struct adapter *adap, struct sge_rspq *rspq, bool fwevtq, int t4_sge_eth_txq_start(struct sge_eth_txq *txq); int t4_sge_eth_txq_stop(struct sge_eth_txq *txq); void t4_sge_eth_txq_release(struct adapter *adap, struct sge_eth_txq *txq); -int t4_sge_eth_rxq_start(struct adapter *adap, struct sge_rspq *rq); -int t4_sge_eth_rxq_stop(struct adapter *adap, struct sge_rspq *rq); +int t4_sge_eth_rxq_start(struct adapter *adap, struct sge_eth_rxq *rxq); +int t4_sge_eth_rxq_stop(struct adapter *adap, struct sge_eth_rxq *rxq); void t4_sge_eth_rxq_release(struct adapter *adap, struct sge_eth_rxq *rxq); void t4_sge_eth_clear_queues(struct port_info *pi); +void t4_sge_eth_release_queues(struct port_info *pi); int cxgb4_set_rspq_intr_params(struct sge_rspq *q, unsigned int us, unsigned int cnt); int cxgbe_poll(struct sge_rspq *q, struct rte_mbuf **rx_pkts,