X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fsfc%2Fsfc.h;h=fee1738d1d212bbc4df5881fb9a120dd902b32f0;hb=d61138d4f0e2927cc1d0fef6d810fa7f5d1161a1;hp=6c99e9e66ae833b35eab7b482fc1dcf3288147fd;hpb=048a0d1a81b64f003d08468c5b18ac3a0406e819;p=dpdk.git diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h index 6c99e9e66a..fee1738d1d 100644 --- a/drivers/net/sfc/sfc.h +++ b/drivers/net/sfc/sfc.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause - * - * Copyright (c) 2016-2018 Solarflare Communications Inc. - * All rights reserved. +* + * Copyright(c) 2019-2021 Xilinx, Inc. + * Copyright(c) 2016-2019 Solarflare Communications Inc. * * This software was jointly developed between OKTET Labs (under contract * for Solarflare) and Solarflare Communications, Inc. @@ -14,70 +14,32 @@ #include #include -#include +#include #include #include #include #include "efx.h" +#include "sfc_efx_mcdi.h" +#include "sfc_efx.h" + +#include "sfc_debug.h" +#include "sfc_log.h" #include "sfc_filter.h" +#include "sfc_flow_tunnel.h" +#include "sfc_sriov.h" +#include "sfc_mae.h" +#include "sfc_dp.h" +#include "sfc_sw_stats.h" +#include "sfc_repr_proxy.h" +#include "sfc_service.h" +#include "sfc_ethdev_state.h" #ifdef __cplusplus extern "C" { #endif -/* - * +---------------+ - * | UNINITIALIZED |<-----------+ - * +---------------+ | - * |.eth_dev_init |.eth_dev_uninit - * V | - * +---------------+------------+ - * | INITIALIZED | - * +---------------+<-----------<---------------+ - * |.dev_configure | | - * V |failed | - * +---------------+------------+ | - * | CONFIGURING | | - * +---------------+----+ | - * |success | | - * | | +---------------+ - * | | | CLOSING | - * | | +---------------+ - * | | ^ - * V |.dev_configure | - * +---------------+----+ |.dev_close - * | CONFIGURED |----------------------------+ - * +---------------+<-----------+ - * |.dev_start | - * V | - * +---------------+ | - * | STARTING |------------^ - * +---------------+ failed | - * |success | - * | +---------------+ - * | | STOPPING | - * | +---------------+ - * | ^ - * V |.dev_stop - * +---------------+------------+ - * | STARTED | - * +---------------+ - */ -enum sfc_adapter_state { - SFC_ADAPTER_UNINITIALIZED = 0, - SFC_ADAPTER_INITIALIZED, - SFC_ADAPTER_CONFIGURING, - SFC_ADAPTER_CONFIGURED, - SFC_ADAPTER_CLOSING, - SFC_ADAPTER_STARTING, - SFC_ADAPTER_STARTED, - SFC_ADAPTER_STOPPING, - - SFC_ADAPTER_NSTATES -}; - enum sfc_dev_filter_mode { SFC_DEV_FILTER_MODE_PROMISC = 0, SFC_DEV_FILTER_MODE_ALLMULTI, @@ -85,29 +47,11 @@ enum sfc_dev_filter_mode { SFC_DEV_FILTER_NMODES }; -enum sfc_mcdi_state { - SFC_MCDI_UNINITIALIZED = 0, - SFC_MCDI_INITIALIZED, - SFC_MCDI_BUSY, - SFC_MCDI_COMPLETED, - - SFC_MCDI_NSTATES -}; - -struct sfc_mcdi { - rte_spinlock_t lock; - efsys_mem_t mem; - enum sfc_mcdi_state state; - efx_mcdi_transport_t transport; - uint32_t logtype; - uint32_t proxy_handle; - efx_rc_t proxy_result; -}; - struct sfc_intr { efx_intr_type_t type; rte_intr_callback_fn handler; boolean_t lsc_intr; + boolean_t rxq_intr; }; struct sfc_rxq; @@ -134,13 +78,12 @@ struct sfc_port { boolean_t promisc; boolean_t allmulti; - struct ether_addr default_mac_addr; + struct rte_ether_addr default_mac_addr; unsigned int max_mcast_addrs; unsigned int nb_mcast_addrs; uint8_t *mcast_addrs; - rte_spinlock_t mac_stats_lock; uint64_t *mac_stats_buf; unsigned int mac_stats_nb_supported; efsys_mem_t mac_stats_dma_mem; @@ -152,6 +95,8 @@ struct sfc_port { uint32_t mac_stats_mask[EFX_MAC_STATS_MASK_NPAGES]; + unsigned int mac_stats_by_id[EFX_MAC_NSTATS]; + uint64_t ipackets; }; @@ -171,26 +116,35 @@ struct sfc_rss { efx_rx_hash_type_t hash_types; unsigned int tbl[EFX_RSS_TBL_SIZE]; uint8_t key[EFX_RSS_KEY_SIZE]; + + uint32_t dummy_rss_context; }; /* Adapter private data shared by primary and secondary processes */ struct sfc_adapter_shared { unsigned int rxq_count; struct sfc_rxq_info *rxq_info; + unsigned int ethdev_rxq_count; unsigned int txq_count; struct sfc_txq_info *txq_info; + unsigned int ethdev_txq_count; struct sfc_rss rss; boolean_t isolated; uint32_t tunnel_encaps; + char log_prefix[SFC_LOG_PREFIX_MAX]; struct rte_pci_addr pci_addr; uint16_t port_id; char *dp_rx_name; char *dp_tx_name; + + bool counters_rxq_allocated; + unsigned int nb_repr_rxq; + unsigned int nb_repr_txq; }; /* Adapter process private data */ @@ -210,6 +164,44 @@ sfc_adapter_priv_by_eth_dev(struct rte_eth_dev *eth_dev) return sap; } +/* RxQ dedicated for counters (counter only RxQ) data */ +struct sfc_counter_rxq { + unsigned int state; +#define SFC_COUNTER_RXQ_ATTACHED 0x1 +#define SFC_COUNTER_RXQ_INITIALIZED 0x2 + sfc_sw_index_t sw_index; + struct rte_mempool *mp; +}; + +struct sfc_sw_stat_data { + const struct sfc_sw_stat_descr *descr; + /* Cache fragment */ + uint64_t *cache; +}; + +struct sfc_sw_stats { + /* Number extended statistics provided by SW stats */ + unsigned int xstats_count; + /* Supported SW statistics */ + struct sfc_sw_stat_data *supp; + unsigned int supp_count; + + /* Cache for all supported SW statistics */ + uint64_t *cache; + unsigned int cache_count; + + uint64_t *reset_vals; + /* Location of per-queue reset values for packets/bytes in reset_vals */ + uint64_t *reset_rx_pkts; + uint64_t *reset_rx_bytes; + uint64_t *reset_tx_pkts; + uint64_t *reset_tx_bytes; + + rte_spinlock_t queues_bitmap_lock; + void *queues_bitmap_mem; + struct rte_bitmap *queues_bitmap; +}; + /* Adapter private data */ struct sfc_adapter { /* @@ -226,20 +218,30 @@ struct sfc_adapter { * change its state should acquire the lock. */ rte_spinlock_t lock; - enum sfc_adapter_state state; + enum sfc_ethdev_state state; struct rte_eth_dev *eth_dev; struct rte_kvargs *kvargs; int socket_id; efsys_bar_t mem_bar; + /* Function control window offset */ + efsys_dma_addr_t fcw_offset; efx_family_t family; efx_nic_t *nic; rte_spinlock_t nic_lock; rte_atomic32_t restart_required; - struct sfc_mcdi mcdi; + struct sfc_efx_mcdi mcdi; + struct sfc_sriov sriov; struct sfc_intr intr; struct sfc_port port; + struct sfc_sw_stats sw_stats; + /* Registry of tunnel offload contexts */ + struct sfc_flow_tunnel flow_tunnels[SFC_FT_MAX_NTUNNELS]; struct sfc_filter filter; + struct sfc_mae mae; + struct sfc_repr_proxy repr_proxy; + + struct sfc_flow_list flow_list; unsigned int rxq_max; unsigned int txq_max; @@ -250,6 +252,9 @@ struct sfc_adapter { unsigned int txq_max_entries; unsigned int txq_min_entries; + unsigned int evq_max_entries; + unsigned int evq_min_entries; + uint32_t evq_flags; unsigned int evq_count; @@ -279,12 +284,19 @@ struct sfc_adapter { bool mgmt_evq_running; struct sfc_evq *mgmt_evq; + struct sfc_counter_rxq counter_rxq; + struct sfc_rxq *rxq_ctrl; struct sfc_txq *txq_ctrl; boolean_t tso; + boolean_t tso_encap; + + uint64_t negotiated_rx_metadata; uint32_t rxd_wait_timeout_ns; + + bool switchdev; }; static inline struct sfc_adapter_shared * @@ -352,6 +364,27 @@ sfc_adapter_lock_fini(__rte_unused struct sfc_adapter *sa) /* Just for symmetry of the API */ } +static inline unsigned int +sfc_nb_counter_rxq(const struct sfc_adapter_shared *sas) +{ + return sas->counters_rxq_allocated ? 1 : 0; +} + +bool sfc_repr_supported(const struct sfc_adapter *sa); +bool sfc_repr_available(const struct sfc_adapter_shared *sas); + +static inline unsigned int +sfc_repr_nb_rxq(const struct sfc_adapter_shared *sas) +{ + return sas->nb_repr_rxq; +} + +static inline unsigned int +sfc_repr_nb_txq(const struct sfc_adapter_shared *sas) +{ + return sas->nb_repr_txq; +} + /** Get the number of milliseconds since boot from the default timer */ static inline uint64_t sfc_get_system_msecs(void) @@ -370,6 +403,7 @@ uint32_t sfc_register_logtype(const struct rte_pci_addr *pci_addr, int sfc_probe(struct sfc_adapter *sa); void sfc_unprobe(struct sfc_adapter *sa); int sfc_attach(struct sfc_adapter *sa); +void sfc_pre_detach(struct sfc_adapter *sa); void sfc_detach(struct sfc_adapter *sa); int sfc_start(struct sfc_adapter *sa); void sfc_stop(struct sfc_adapter *sa); @@ -397,10 +431,23 @@ int sfc_port_start(struct sfc_adapter *sa); void sfc_port_stop(struct sfc_adapter *sa); void sfc_port_link_mode_to_info(efx_link_mode_t link_mode, struct rte_eth_link *link_info); -int sfc_port_update_mac_stats(struct sfc_adapter *sa); +int sfc_port_update_mac_stats(struct sfc_adapter *sa, boolean_t manual_update); +int sfc_port_get_mac_stats(struct sfc_adapter *sa, struct rte_eth_xstat *xstats, + unsigned int xstats_count, unsigned int *nb_written); +int sfc_port_get_mac_stats_by_id(struct sfc_adapter *sa, const uint64_t *ids, + uint64_t *values, unsigned int n); int sfc_port_reset_mac_stats(struct sfc_adapter *sa); int sfc_set_rx_mode(struct sfc_adapter *sa); +int sfc_set_rx_mode_unchecked(struct sfc_adapter *sa); + +struct sfc_hw_switch_id; +int sfc_hw_switch_id_init(struct sfc_adapter *sa, + struct sfc_hw_switch_id **idp); +void sfc_hw_switch_id_fini(struct sfc_adapter *sa, + struct sfc_hw_switch_id *idp); +bool sfc_hw_switch_ids_equal(const struct sfc_hw_switch_id *left, + const struct sfc_hw_switch_id *right); #ifdef __cplusplus }