net/sfc/base: add API to control UDP tunnel ports
[dpdk.git] / drivers / net / sfc / base / efx_impl.h
index a6853b3..7c971b3 100644 (file)
@@ -74,6 +74,7 @@ extern "C" {
 #define        EFX_MOD_MON             0x00000400
 #define        EFX_MOD_FILTER          0x00001000
 #define        EFX_MOD_LIC             0x00002000
+#define        EFX_MOD_TUNNEL          0x00004000
 
 #define        EFX_RESET_PHY           0x00000001
 #define        EFX_RESET_RXQ_ERR       0x00000002
@@ -97,6 +98,9 @@ typedef struct efx_ev_ops_s {
        efx_rc_t        (*eevo_qprime)(efx_evq_t *, unsigned int);
        void            (*eevo_qpost)(efx_evq_t *, uint16_t);
        efx_rc_t        (*eevo_qmoderate)(efx_evq_t *, unsigned int);
+#if EFSYS_OPT_QSTATS
+       void            (*eevo_qstats_update)(efx_evq_t *, efsys_stat_t *);
+#endif
 } efx_ev_ops_t;
 
 typedef struct efx_tx_ops_s {
@@ -136,22 +140,51 @@ typedef struct efx_tx_ops_s {
                                                efx_desc_t *, int);
        void            (*etxo_qdesc_vlantci_create)(efx_txq_t *, uint16_t,
                                                efx_desc_t *);
+#if EFSYS_OPT_QSTATS
+       void            (*etxo_qstats_update)(efx_txq_t *,
+                                             efsys_stat_t *);
+#endif
 } efx_tx_ops_t;
 
 typedef struct efx_rx_ops_s {
        efx_rc_t        (*erxo_init)(efx_nic_t *);
        void            (*erxo_fini)(efx_nic_t *);
+#if EFSYS_OPT_RX_SCATTER
+       efx_rc_t        (*erxo_scatter_enable)(efx_nic_t *, unsigned int);
+#endif
+#if EFSYS_OPT_RX_SCALE
+       efx_rc_t        (*erxo_scale_context_alloc)(efx_nic_t *,
+                                                   efx_rx_scale_context_type_t,
+                                                   uint32_t, uint32_t *);
+       efx_rc_t        (*erxo_scale_context_free)(efx_nic_t *, uint32_t);
+       efx_rc_t        (*erxo_scale_mode_set)(efx_nic_t *, uint32_t,
+                                              efx_rx_hash_alg_t,
+                                              efx_rx_hash_type_t, boolean_t);
+       efx_rc_t        (*erxo_scale_key_set)(efx_nic_t *, uint32_t,
+                                             uint8_t *, size_t);
+       efx_rc_t        (*erxo_scale_tbl_set)(efx_nic_t *, uint32_t,
+                                             unsigned int *, size_t);
+       uint32_t        (*erxo_prefix_hash)(efx_nic_t *, efx_rx_hash_alg_t,
+                                           uint8_t *);
+#endif /* EFSYS_OPT_RX_SCALE */
        efx_rc_t        (*erxo_prefix_pktlen)(efx_nic_t *, uint8_t *,
                                              uint16_t *);
        void            (*erxo_qpost)(efx_rxq_t *, efsys_dma_addr_t *, size_t,
                                      unsigned int, unsigned int,
                                      unsigned int);
        void            (*erxo_qpush)(efx_rxq_t *, unsigned int, unsigned int *);
+#if EFSYS_OPT_RX_PACKED_STREAM
+       void            (*erxo_qpush_ps_credits)(efx_rxq_t *);
+       uint8_t *       (*erxo_qps_packet_info)(efx_rxq_t *, uint8_t *,
+                                               uint32_t, uint32_t,
+                                               uint16_t *, uint32_t *, uint32_t *);
+#endif
        efx_rc_t        (*erxo_qflush)(efx_rxq_t *);
        void            (*erxo_qenable)(efx_rxq_t *);
        efx_rc_t        (*erxo_qcreate)(efx_nic_t *enp, unsigned int,
-                                       unsigned int, efx_rxq_type_t,
+                                       unsigned int, efx_rxq_type_t, uint32_t,
                                        efsys_mem_t *, size_t, uint32_t,
+                                       unsigned int,
                                        efx_evq_t *, efx_rxq_t *);
        void            (*erxo_qdestroy)(efx_rxq_t *);
 } efx_rx_ops_t;
@@ -167,6 +200,19 @@ typedef struct efx_mac_ops_s {
        efx_rc_t        (*emo_filter_default_rxq_set)(efx_nic_t *,
                                                      efx_rxq_t *, boolean_t);
        void            (*emo_filter_default_rxq_clear)(efx_nic_t *);
+#if EFSYS_OPT_LOOPBACK
+       efx_rc_t        (*emo_loopback_set)(efx_nic_t *, efx_link_mode_t,
+                                           efx_loopback_type_t);
+#endif /* EFSYS_OPT_LOOPBACK */
+#if EFSYS_OPT_MAC_STATS
+       efx_rc_t        (*emo_stats_get_mask)(efx_nic_t *, uint32_t *, size_t);
+       efx_rc_t        (*emo_stats_clear)(efx_nic_t *);
+       efx_rc_t        (*emo_stats_upload)(efx_nic_t *, efsys_mem_t *);
+       efx_rc_t        (*emo_stats_periodic)(efx_nic_t *, efsys_mem_t *,
+                                             uint16_t, boolean_t);
+       efx_rc_t        (*emo_stats_update)(efx_nic_t *, efsys_mem_t *,
+                                           efsys_stat_t *, uint32_t *);
+#endif /* EFSYS_OPT_MAC_STATS */
 } efx_mac_ops_t;
 
 typedef struct efx_phy_ops_s {
@@ -175,6 +221,10 @@ typedef struct efx_phy_ops_s {
        efx_rc_t        (*epo_reconfigure)(efx_nic_t *);
        efx_rc_t        (*epo_verify)(efx_nic_t *);
        efx_rc_t        (*epo_oui_get)(efx_nic_t *, uint32_t *);
+#if EFSYS_OPT_PHY_STATS
+       efx_rc_t        (*epo_stats_update)(efx_nic_t *, efsys_mem_t *,
+                                           uint32_t *);
+#endif /* EFSYS_OPT_PHY_STATS */
 #if EFSYS_OPT_BIST
        efx_rc_t        (*epo_bist_enable_offline)(efx_nic_t *);
        efx_rc_t        (*epo_bist_start)(efx_nic_t *, efx_bist_type_t);
@@ -193,7 +243,8 @@ typedef struct efx_filter_ops_s {
        efx_rc_t        (*efo_add)(efx_nic_t *, efx_filter_spec_t *,
                                   boolean_t may_replace);
        efx_rc_t        (*efo_delete)(efx_nic_t *, efx_filter_spec_t *);
-       efx_rc_t        (*efo_supported_filters)(efx_nic_t *, uint32_t *, size_t *);
+       efx_rc_t        (*efo_supported_filters)(efx_nic_t *, uint32_t *,
+                                  size_t, size_t *);
        efx_rc_t        (*efo_reconfigure)(efx_nic_t *, uint8_t const *, boolean_t,
                                   boolean_t, boolean_t, boolean_t,
                                   uint8_t const *, uint32_t);
@@ -212,6 +263,12 @@ efx_filter_reconfigure(
 
 #endif /* EFSYS_OPT_FILTER */
 
+#if EFSYS_OPT_TUNNEL
+typedef struct efx_tunnel_ops_s {
+       boolean_t       (*eto_udp_encap_supported)(efx_nic_t *);
+       efx_rc_t        (*eto_reconfigure)(efx_nic_t *);
+} efx_tunnel_ops_t;
+#endif /* EFSYS_OPT_TUNNEL */
 
 typedef struct efx_port_s {
        efx_mac_type_t          ep_mac_type;
@@ -230,6 +287,16 @@ typedef struct efx_port_s {
        uint8_t                 ep_mulcst_addr_list[EFX_MAC_ADDR_LEN *
                                                    EFX_MAC_MULTICAST_LIST_MAX];
        uint32_t                ep_mulcst_addr_count;
+#if EFSYS_OPT_LOOPBACK
+       efx_loopback_type_t     ep_loopback_type;
+       efx_link_mode_t         ep_loopback_link_mode;
+#endif /* EFSYS_OPT_LOOPBACK */
+#if EFSYS_OPT_PHY_FLAGS
+       uint32_t                ep_phy_flags;
+#endif /* EFSYS_OPT_PHY_FLAGS */
+#if EFSYS_OPT_PHY_LED_CONTROL
+       efx_phy_led_mode_t      ep_phy_led_mode;
+#endif /* EFSYS_OPT_PHY_LED_CONTROL */
        efx_phy_media_type_t    ep_fixed_port_type;
        efx_phy_media_type_t    ep_module_type;
        uint32_t                ep_adv_cap_mask;
@@ -237,7 +304,6 @@ typedef struct efx_port_s {
        uint32_t                ep_default_adv_cap_mask;
        uint32_t                ep_phy_cap_mask;
        boolean_t               ep_mac_drain;
-       boolean_t               ep_mac_stats_pending;
 #if EFSYS_OPT_BIST
        efx_bist_type_t         ep_current_bist;
 #endif
@@ -246,6 +312,10 @@ typedef struct efx_port_s {
 } efx_port_t;
 
 typedef struct efx_mon_ops_s {
+#if EFSYS_OPT_MON_STATS
+       efx_rc_t        (*emo_stats_update)(efx_nic_t *, efsys_mem_t *,
+                                           efx_mon_stat_value_t *);
+#endif /* EFSYS_OPT_MON_STATS */
 } efx_mon_ops_t;
 
 typedef struct efx_mon_s {
@@ -295,12 +365,7 @@ typedef struct efx_nic_ops_s {
 #ifndef EFX_RXQ_LIMIT_TARGET
 #define        EFX_RXQ_LIMIT_TARGET 512
 #endif
-#ifndef EFX_TXQ_DC_SIZE
-#define        EFX_TXQ_DC_SIZE 1 /* 16 descriptors */
-#endif
-#ifndef EFX_RXQ_DC_SIZE
-#define        EFX_RXQ_DC_SIZE 3 /* 64 descriptors */
-#endif
+
 
 #if EFSYS_OPT_FILTER
 
@@ -375,6 +440,22 @@ siena_filter_tbl_clear(
 
 #if EFSYS_OPT_MCDI
 
+#define        EFX_TUNNEL_MAXNENTRIES  (16)
+
+#if EFSYS_OPT_TUNNEL
+
+typedef struct efx_tunnel_udp_entry_s {
+       uint16_t                        etue_port; /* host/cpu-endian */
+       uint16_t                        etue_protocol;
+} efx_tunnel_udp_entry_t;
+
+typedef struct efx_tunnel_cfg_s {
+       efx_tunnel_udp_entry_t  etc_udp_entries[EFX_TUNNEL_MAXNENTRIES];
+       unsigned int            etc_udp_entries_num;
+} efx_tunnel_cfg_t;
+
+#endif /* EFSYS_OPT_TUNNEL */
+
 typedef struct efx_mcdi_ops_s {
        efx_rc_t        (*emco_init)(efx_nic_t *, const efx_mcdi_transport_t *);
        void            (*emco_send_request)(efx_nic_t *, void *, size_t,
@@ -397,6 +478,163 @@ typedef struct efx_mcdi_s {
 
 #endif /* EFSYS_OPT_MCDI */
 
+#if EFSYS_OPT_NVRAM
+
+/* Invalid partition ID for en_nvram_partn_locked field of efx_nc_t */
+#define        EFX_NVRAM_PARTN_INVALID         (0xffffffffu)
+
+typedef struct efx_nvram_ops_s {
+#if EFSYS_OPT_DIAG
+       efx_rc_t        (*envo_test)(efx_nic_t *);
+#endif /* EFSYS_OPT_DIAG */
+       efx_rc_t        (*envo_type_to_partn)(efx_nic_t *, efx_nvram_type_t,
+                                           uint32_t *);
+       efx_rc_t        (*envo_partn_size)(efx_nic_t *, uint32_t, size_t *);
+       efx_rc_t        (*envo_partn_rw_start)(efx_nic_t *, uint32_t, size_t *);
+       efx_rc_t        (*envo_partn_read)(efx_nic_t *, uint32_t,
+                                           unsigned int, caddr_t, size_t);
+       efx_rc_t        (*envo_partn_read_backup)(efx_nic_t *, uint32_t,
+                                           unsigned int, caddr_t, size_t);
+       efx_rc_t        (*envo_partn_erase)(efx_nic_t *, uint32_t,
+                                           unsigned int, size_t);
+       efx_rc_t        (*envo_partn_write)(efx_nic_t *, uint32_t,
+                                           unsigned int, caddr_t, size_t);
+       efx_rc_t        (*envo_partn_rw_finish)(efx_nic_t *, uint32_t,
+                                           uint32_t *);
+       efx_rc_t        (*envo_partn_get_version)(efx_nic_t *, uint32_t,
+                                           uint32_t *, uint16_t *);
+       efx_rc_t        (*envo_partn_set_version)(efx_nic_t *, uint32_t,
+                                           uint16_t *);
+       efx_rc_t        (*envo_buffer_validate)(efx_nic_t *, uint32_t,
+                                           caddr_t, size_t);
+} efx_nvram_ops_t;
+#endif /* EFSYS_OPT_NVRAM */
+
+#if EFSYS_OPT_VPD
+typedef struct efx_vpd_ops_s {
+       efx_rc_t        (*evpdo_init)(efx_nic_t *);
+       efx_rc_t        (*evpdo_size)(efx_nic_t *, size_t *);
+       efx_rc_t        (*evpdo_read)(efx_nic_t *, caddr_t, size_t);
+       efx_rc_t        (*evpdo_verify)(efx_nic_t *, caddr_t, size_t);
+       efx_rc_t        (*evpdo_reinit)(efx_nic_t *, caddr_t, size_t);
+       efx_rc_t        (*evpdo_get)(efx_nic_t *, caddr_t, size_t,
+                                       efx_vpd_value_t *);
+       efx_rc_t        (*evpdo_set)(efx_nic_t *, caddr_t, size_t,
+                                       efx_vpd_value_t *);
+       efx_rc_t        (*evpdo_next)(efx_nic_t *, caddr_t, size_t,
+                                       efx_vpd_value_t *, unsigned int *);
+       efx_rc_t        (*evpdo_write)(efx_nic_t *, caddr_t, size_t);
+       void            (*evpdo_fini)(efx_nic_t *);
+} efx_vpd_ops_t;
+#endif /* EFSYS_OPT_VPD */
+
+#if EFSYS_OPT_VPD || EFSYS_OPT_NVRAM
+
+       __checkReturn           efx_rc_t
+efx_mcdi_nvram_partitions(
+       __in                    efx_nic_t *enp,
+       __out_bcount(size)      caddr_t data,
+       __in                    size_t size,
+       __out                   unsigned int *npartnp);
+
+       __checkReturn           efx_rc_t
+efx_mcdi_nvram_metadata(
+       __in                    efx_nic_t *enp,
+       __in                    uint32_t partn,
+       __out                   uint32_t *subtypep,
+       __out_ecount(4)         uint16_t version[4],
+       __out_bcount_opt(size)  char *descp,
+       __in                    size_t size);
+
+       __checkReturn           efx_rc_t
+efx_mcdi_nvram_info(
+       __in                    efx_nic_t *enp,
+       __in                    uint32_t partn,
+       __out_opt               size_t *sizep,
+       __out_opt               uint32_t *addressp,
+       __out_opt               uint32_t *erase_sizep,
+       __out_opt               uint32_t *write_sizep);
+
+       __checkReturn           efx_rc_t
+efx_mcdi_nvram_update_start(
+       __in                    efx_nic_t *enp,
+       __in                    uint32_t partn);
+
+       __checkReturn           efx_rc_t
+efx_mcdi_nvram_read(
+       __in                    efx_nic_t *enp,
+       __in                    uint32_t partn,
+       __in                    uint32_t offset,
+       __out_bcount(size)      caddr_t data,
+       __in                    size_t size,
+       __in                    uint32_t mode);
+
+       __checkReturn           efx_rc_t
+efx_mcdi_nvram_erase(
+       __in                    efx_nic_t *enp,
+       __in                    uint32_t partn,
+       __in                    uint32_t offset,
+       __in                    size_t size);
+
+       __checkReturn           efx_rc_t
+efx_mcdi_nvram_write(
+       __in                    efx_nic_t *enp,
+       __in                    uint32_t partn,
+       __in                    uint32_t offset,
+       __out_bcount(size)      caddr_t data,
+       __in                    size_t size);
+
+       __checkReturn           efx_rc_t
+efx_mcdi_nvram_update_finish(
+       __in                    efx_nic_t *enp,
+       __in                    uint32_t partn,
+       __in                    boolean_t reboot,
+       __out_opt               uint32_t *verify_resultp);
+
+#if EFSYS_OPT_DIAG
+
+       __checkReturn           efx_rc_t
+efx_mcdi_nvram_test(
+       __in                    efx_nic_t *enp,
+       __in                    uint32_t partn);
+
+#endif /* EFSYS_OPT_DIAG */
+
+#endif /* EFSYS_OPT_VPD || EFSYS_OPT_NVRAM */
+
+#if EFSYS_OPT_LICENSING
+
+typedef struct efx_lic_ops_s {
+       efx_rc_t        (*elo_update_licenses)(efx_nic_t *);
+       efx_rc_t        (*elo_get_key_stats)(efx_nic_t *, efx_key_stats_t *);
+       efx_rc_t        (*elo_app_state)(efx_nic_t *, uint64_t, boolean_t *);
+       efx_rc_t        (*elo_get_id)(efx_nic_t *, size_t, uint32_t *,
+                                     size_t *, uint8_t *);
+       efx_rc_t        (*elo_find_start)
+                               (efx_nic_t *, caddr_t, size_t, uint32_t *);
+       efx_rc_t        (*elo_find_end)(efx_nic_t *, caddr_t, size_t,
+                               uint32_t, uint32_t *);
+       boolean_t       (*elo_find_key)(efx_nic_t *, caddr_t, size_t,
+                               uint32_t, uint32_t *, uint32_t *);
+       boolean_t       (*elo_validate_key)(efx_nic_t *,
+                               caddr_t, uint32_t);
+       efx_rc_t        (*elo_read_key)(efx_nic_t *,
+                               caddr_t, size_t, uint32_t, uint32_t,
+                               caddr_t, size_t, uint32_t *);
+       efx_rc_t        (*elo_write_key)(efx_nic_t *,
+                               caddr_t, size_t, uint32_t,
+                               caddr_t, uint32_t, uint32_t *);
+       efx_rc_t        (*elo_delete_key)(efx_nic_t *,
+                               caddr_t, size_t, uint32_t,
+                               uint32_t, uint32_t, uint32_t *);
+       efx_rc_t        (*elo_create_partition)(efx_nic_t *,
+                               caddr_t, size_t);
+       efx_rc_t        (*elo_finish_partition)(efx_nic_t *,
+                               caddr_t, size_t);
+} efx_lic_ops_t;
+
+#endif
+
 typedef struct efx_drv_cfg_s {
        uint32_t                edc_min_vi_count;
        uint32_t                edc_max_vi_count;
@@ -430,13 +668,40 @@ struct efx_nic_s {
        efx_filter_t            en_filter;
        const efx_filter_ops_t  *en_efop;
 #endif /* EFSYS_OPT_FILTER */
+#if EFSYS_OPT_TUNNEL
+       efx_tunnel_cfg_t        en_tunnel_cfg;
+       const efx_tunnel_ops_t  *en_etop;
+#endif /* EFSYS_OPT_TUNNEL */
 #if EFSYS_OPT_MCDI
        efx_mcdi_t              en_mcdi;
 #endif /* EFSYS_OPT_MCDI */
+#if EFSYS_OPT_NVRAM
+       uint32_t                en_nvram_partn_locked;
+       const efx_nvram_ops_t   *en_envop;
+#endif /* EFSYS_OPT_NVRAM */
+#if EFSYS_OPT_VPD
+       const efx_vpd_ops_t     *en_evpdop;
+#endif /* EFSYS_OPT_VPD */
+#if EFSYS_OPT_RX_SCALE
+       efx_rx_hash_support_t           en_hash_support;
+       efx_rx_scale_context_type_t     en_rss_context_type;
+       uint32_t                        en_rss_context;
+#endif /* EFSYS_OPT_RX_SCALE */
        uint32_t                en_vport_id;
+#if EFSYS_OPT_LICENSING
+       const efx_lic_ops_t     *en_elop;
+       boolean_t               en_licensing_supported;
+#endif
        union {
 #if EFSYS_OPT_SIENA
                struct {
+#if EFSYS_OPT_NVRAM || EFSYS_OPT_VPD
+                       unsigned int            enu_partn_mask;
+#endif /* EFSYS_OPT_NVRAM || EFSYS_OPT_VPD */
+#if EFSYS_OPT_VPD
+                       caddr_t                 enu_svpd;
+                       size_t                  enu_svpd_length;
+#endif /* EFSYS_OPT_VPD */
                        int                     enu_unused;
                } siena;
 #endif /* EFSYS_OPT_SIENA */
@@ -448,6 +713,10 @@ struct efx_nic_s {
                        int                     ena_vi_base;
                        int                     ena_vi_count;
                        int                     ena_vi_shift;
+#if EFSYS_OPT_VPD
+                       caddr_t                 ena_svpd;
+                       size_t                  ena_svpd_length;
+#endif /* EFSYS_OPT_VPD */
                        efx_piobuf_handle_t     ena_piobuf_handle[EF10_MAX_PIOBUF_NBUFS];
                        uint32_t                ena_piobuf_count;
                        uint32_t                ena_pio_alloc_map[EF10_MAX_PIOBUF_NBUFS];
@@ -471,6 +740,11 @@ typedef    boolean_t (*efx_ev_handler_t)(efx_evq_t *, efx_qword_t *,
 typedef struct efx_evq_rxq_state_s {
        unsigned int                    eers_rx_read_ptr;
        unsigned int                    eers_rx_mask;
+#if EFSYS_OPT_RX_PACKED_STREAM
+       unsigned int                    eers_rx_stream_npackets;
+       boolean_t                       eers_rx_packed_stream;
+       unsigned int                    eers_rx_packed_stream_credits;
+#endif
 } efx_evq_rxq_state_t;
 
 struct efx_evq_s {
@@ -479,6 +753,9 @@ struct efx_evq_s {
        unsigned int                    ee_index;
        unsigned int                    ee_mask;
        efsys_mem_t                     *ee_esmp;
+#if EFSYS_OPT_QSTATS
+       uint32_t                        ee_stat[EV_NQSTATS];
+#endif /* EFSYS_OPT_QSTATS */
 
        efx_ev_handler_t                ee_rx;
        efx_ev_handler_t                ee_tx;
@@ -506,6 +783,7 @@ struct efx_rxq_s {
        unsigned int                    er_label;
        unsigned int                    er_mask;
        efsys_mem_t                     *er_esmp;
+       efx_evq_rxq_state_t             *er_ev_qstate;
 };
 
 #define        EFX_RXQ_MAGIC   0x15022005
@@ -523,6 +801,9 @@ struct efx_txq_s {
        uint32_t                        et_pio_offset;
        size_t                          et_pio_size;
 #endif
+#if EFSYS_OPT_QSTATS
+       uint32_t                        et_stat[TX_NQSTATS];
+#endif /* EFSYS_OPT_QSTATS */
 };
 
 #define        EFX_TXQ_MAGIC   0x05092005
@@ -785,8 +1066,7 @@ struct efx_txq_s {
        do {                                                            \
                EFX_CHECK_REG((_enp), (_reg));                          \
                EFSYS_PROBE7(efx_bar_tbl_doorbell_writeo,               \
-                   const char *,                                       \
-                   #_reg,                                              \
+                   const char *, #_reg,                                \
                    uint32_t, (_index),                                 \
                    uint32_t, _reg ## _OFST,                            \
                    uint32_t, (_eop)->eo_u32[3],                        \
@@ -820,10 +1100,6 @@ struct efx_txq_s {
        _NOTE(CONSTANTCONDITION)                                        \
        } while (B_FALSE)
 
-extern __checkReturn   efx_rc_t
-efx_nic_biu_test(
-       __in            efx_nic_t *enp);
-
 extern __checkReturn   efx_rc_t
 efx_mac_select(
        __in            efx_nic_t *enp);
@@ -843,31 +1119,54 @@ extern                   void
 efx_phy_unprobe(
        __in            efx_nic_t *enp);
 
-#if EFSYS_OPT_DIAG
+#if EFSYS_OPT_VPD
 
-extern efx_sram_pattern_fn_t   __efx_sram_pattern_fns[];
+/* VPD utility functions */
 
-typedef struct efx_register_set_s {
-       unsigned int            address;
-       unsigned int            step;
-       unsigned int            rows;
-       efx_oword_t             mask;
-} efx_register_set_t;
+extern __checkReturn           efx_rc_t
+efx_vpd_hunk_length(
+       __in_bcount(size)       caddr_t data,
+       __in                    size_t size,
+       __out                   size_t *lengthp);
 
-extern __checkReturn   efx_rc_t
-efx_nic_test_registers(
-       __in            efx_nic_t *enp,
-       __in            efx_register_set_t *rsp,
-       __in            size_t count);
+extern __checkReturn           efx_rc_t
+efx_vpd_hunk_verify(
+       __in_bcount(size)       caddr_t data,
+       __in                    size_t size,
+       __out_opt               boolean_t *cksummedp);
 
-extern __checkReturn   efx_rc_t
-efx_nic_test_tables(
-       __in            efx_nic_t *enp,
-       __in            efx_register_set_t *rsp,
-       __in            efx_pattern_type_t pattern,
-       __in            size_t count);
+extern __checkReturn           efx_rc_t
+efx_vpd_hunk_reinit(
+       __in_bcount(size)       caddr_t data,
+       __in                    size_t size,
+       __in                    boolean_t wantpid);
 
-#endif /* EFSYS_OPT_DIAG */
+extern __checkReturn           efx_rc_t
+efx_vpd_hunk_get(
+       __in_bcount(size)       caddr_t data,
+       __in                    size_t size,
+       __in                    efx_vpd_tag_t tag,
+       __in                    efx_vpd_keyword_t keyword,
+       __out                   unsigned int *payloadp,
+       __out                   uint8_t *paylenp);
+
+extern __checkReturn                   efx_rc_t
+efx_vpd_hunk_next(
+       __in_bcount(size)               caddr_t data,
+       __in                            size_t size,
+       __out                           efx_vpd_tag_t *tagp,
+       __out                           efx_vpd_keyword_t *keyword,
+       __out_opt                       unsigned int *payloadp,
+       __out_opt                       uint8_t *paylenp,
+       __inout                         unsigned int *contp);
+
+extern __checkReturn           efx_rc_t
+efx_vpd_hunk_set(
+       __in_bcount(size)       caddr_t data,
+       __in                    size_t size,
+       __in                    efx_vpd_value_t *evvp);
+
+#endif /* EFSYS_OPT_VPD */
 
 #if EFSYS_OPT_MCDI
 
@@ -886,6 +1185,27 @@ efx_mcdi_get_workarounds(
 
 #endif /* EFSYS_OPT_MCDI */
 
+#if EFSYS_OPT_MAC_STATS
+
+/*
+ * Closed range of stats (i.e. the first and the last are included).
+ * The last must be greater or equal (if the range is one item only) to
+ * the first.
+ */
+struct efx_mac_stats_range {
+       efx_mac_stat_t          first;
+       efx_mac_stat_t          last;
+};
+
+extern                                 efx_rc_t
+efx_mac_stats_mask_add_ranges(
+       __inout_bcount(mask_size)       uint32_t *maskp,
+       __in                            size_t mask_size,
+       __in_ecount(rng_count)          const struct efx_mac_stats_range *rngp,
+       __in                            unsigned int rng_count);
+
+#endif /* EFSYS_OPT_MAC_STATS */
+
 #ifdef __cplusplus
 }
 #endif