net/sfc/base: move a macro to Siena implementation header

[dpdk.git] / drivers / net / sfc / base / efx.h

diff --git a/drivers/net/sfc/base/efx.h b/drivers/net/sfc/base/efx.h
index 8e10e89..71500d6 100644 (file)
--- a/drivers/net/sfc/base/efx.h
+++ b/drivers/net/sfc/base/efx.h
@@ -300,7 +300,7 @@ extern      __checkReturn   efx_rc_t
 efx_intr_init(
        __in            efx_nic_t *enp,
        __in            efx_intr_type_t type,
-       __in            efsys_mem_t *esmp);
+       __in_opt        efsys_mem_t *esmp);
 
 extern                 void
 efx_intr_enable(
@@ -1233,6 +1233,7 @@ efx_bist_stop(
 #define        EFX_FEATURE_FW_ASSISTED_TSO     0x00001000
 #define        EFX_FEATURE_FW_ASSISTED_TSO_V2  0x00002000
 #define        EFX_FEATURE_PACKED_STREAM       0x00004000
+#define        EFX_FEATURE_TXQ_CKSUM_OP_DESC   0x00008000
 
 typedef enum efx_tunnel_protocol_e {
        EFX_TUNNEL_PROTOCOL_NONE = 0,
@@ -1270,7 +1271,12 @@ typedef struct efx_nic_cfg_s {
        uint32_t                enc_evq_limit;
        uint32_t                enc_txq_limit;
        uint32_t                enc_rxq_limit;
+       uint32_t                enc_evq_max_nevs;
+       uint32_t                enc_evq_min_nevs;
+       uint32_t                enc_rxq_max_ndescs;
+       uint32_t                enc_rxq_min_ndescs;
        uint32_t                enc_txq_max_ndescs;
+       uint32_t                enc_txq_min_ndescs;
        uint32_t                enc_buftbl_limit;
        uint32_t                enc_piobuf_limit;
        uint32_t                enc_piobuf_size;
@@ -1972,6 +1978,10 @@ extern           void
 efx_ev_fini(
        __in            efx_nic_t *enp);
 
+/*
+ * These symbols are deprecated and will be removed.
+ * Use the fields from efx_nic_cfg_t instead.
+ */
 #define        EFX_EVQ_MAXNEVS         32768
 #define        EFX_EVQ_MINNEVS         512
 
@@ -2460,13 +2470,16 @@ efx_pseudo_hdr_pkt_length_get(
        __in            uint8_t *buffer,
        __out           uint16_t *pkt_lengthp);
 
-#define        EFX_RXQ_MAXNDESCS               4096
-#define        EFX_RXQ_MINNDESCS               512
+/*
+ * These symbols are deprecated and will be removed.
+ * Use the fields from efx_nic_cfg_t instead.
+ */
+#define        EFX_RXQ_MAXNDESCS               4096
+#define        EFX_RXQ_MINNDESCS               512
 
 #define        EFX_RXQ_SIZE(_ndescs)           ((_ndescs) * sizeof (efx_qword_t))
 #define        EFX_RXQ_NBUFS(_ndescs)          (EFX_RXQ_SIZE(_ndescs) / EFX_BUF_SIZE)
 #define        EFX_RXQ_LIMIT(_ndescs)          ((_ndescs) - 16)
-#define        EFX_RXQ_DC_NDESCS(_dcsize)      (8 << _dcsize)
 
 typedef enum efx_rxq_type_e {
        EFX_RXQ_TYPE_DEFAULT,
@@ -2626,6 +2639,10 @@ extern           void
 efx_tx_fini(
        __in    efx_nic_t *enp);
 
+/*
+ * This symbol is deprecated and will be removed.
+ * Use the field from efx_nic_cfg_t instead.
+ */
 #define        EFX_TXQ_MINNDESCS               512
 
 #define        EFX_TXQ_SIZE(_ndescs)           ((_ndescs) * sizeof (efx_qword_t))
@@ -2878,6 +2895,8 @@ typedef struct efx_filter_spec_s {
        efx_filter_flags_t              efs_flags;
        uint16_t                        efs_dmaq_id;
        uint32_t                        efs_rss_context;
+       uint32_t                        efs_mark;
+       /* Fields below here are hashed for software filter lookup */
        uint16_t                        efs_outer_vid;
        uint16_t                        efs_inner_vid;
        uint8_t                         efs_loc_mac[EFX_MAC_ADDR_LEN];
@@ -2891,7 +2910,6 @@ typedef struct efx_filter_spec_s {
        efx_oword_t                     efs_loc_host;
        uint8_t                         efs_vni_or_vsid[EFX_VNI_OR_VSID_LEN];
        uint8_t                         efs_ifrm_loc_mac[EFX_MAC_ADDR_LEN];
-       uint32_t                        efs_mark;
 } efx_filter_spec_t;