X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fsfc%2Fsfc.h;h=331e06bac6c0df87123147a6114ccbd80eebec1d;hb=b43045eedeebb15354d85babdb84171a1073aa9d;hp=dde25c5536acd952613b8cad31b46d0919e5b9aa;hpb=6d13ea8e8e49ab957deae2bba5ecf4a4bfe747d1;p=dpdk.git diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h index dde25c5536..331e06bac6 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,14 +14,22 @@ #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_sriov.h" +#include "sfc_mae.h" +#include "sfc_dp.h" #ifdef __cplusplus extern "C" { @@ -85,29 +93,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; @@ -140,7 +130,6 @@ struct sfc_port { 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 +141,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 +162,33 @@ 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; }; /* Adapter process private data */ @@ -210,6 +208,23 @@ 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_xstats { + uint64_t *reset_vals; + + rte_spinlock_t queues_bitmap_lock; + void *queues_bitmap_mem; + struct rte_bitmap *queues_bitmap; +}; + /* Adapter private data */ struct sfc_adapter { /* @@ -231,15 +246,22 @@ struct sfc_adapter { 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_xstats sw_xstats; struct sfc_filter filter; + struct sfc_mae mae; + + struct sfc_flow_list flow_list; unsigned int rxq_max; unsigned int txq_max; @@ -282,6 +304,8 @@ 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; @@ -356,6 +380,12 @@ 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; +} + /** Get the number of milliseconds since boot from the default timer */ static inline uint64_t sfc_get_system_msecs(void) @@ -401,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 }