/* SPDX-License-Identifier: BSD-3-Clause
- *
- * Copyright (c) 2016-2018 Solarflare Communications Inc.
- * All rights reserved.
+*
+ * Copyright(c) 2019-2020 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.
#include "efx.h"
+#include "sfc_efx_mcdi.h"
+
+#include "sfc_debug.h"
+#include "sfc_log.h"
#include "sfc_filter.h"
+#include "sfc_sriov.h"
+#include "sfc_mae.h"
#ifdef __cplusplus
extern "C" {
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;
* Flow API isolated mode overrides promisc and allmulti settings;
* they won't be applied if isolated mode is active
*/
- boolean_t isolated;
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;
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 */
unsigned int rxq_count;
struct sfc_rxq_info *rxq_info;
+ unsigned int txq_count;
+ struct sfc_txq_info *txq_info;
+
+ 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;
*/
struct sfc_adapter_priv priv;
- /*
- * Temporary placeholder for multi-process shared data for
- * transition.
- */
- struct sfc_adapter_shared _shared;
-
/*
* PMD setup and configuration is not thread safe. Since it is not
* performance sensitive, it is better to guarantee thread-safety
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_filter filter;
+ struct sfc_mae mae;
+
+ struct sfc_flow_list flow_list;
unsigned int rxq_max;
unsigned int txq_max;
+ unsigned int rxq_max_entries;
+ unsigned int rxq_min_entries;
+
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;
struct sfc_evq *mgmt_evq;
struct sfc_rxq *rxq_ctrl;
-
- unsigned int txq_count;
- struct sfc_txq_info *txq_info;
struct sfc_txq *txq_ctrl;
boolean_t tso;
+ boolean_t tso_encap;
uint32_t rxd_wait_timeout_ns;
-
- struct sfc_rss rss;
};
static inline struct sfc_adapter_shared *
sfc_adapter_shared_by_eth_dev(struct rte_eth_dev *eth_dev)
{
- struct sfc_adapter *sa = eth_dev->data->dev_private;
+ struct sfc_adapter_shared *sas = eth_dev->data->dev_private;
- return sa->priv.shared;
+ return sas;
+}
+
+static inline struct sfc_adapter *
+sfc_adapter_by_eth_dev(struct rte_eth_dev *eth_dev)
+{
+ struct sfc_adapter_priv *sap = sfc_adapter_priv_by_eth_dev(eth_dev);
+
+ SFC_ASSERT(rte_eal_process_type() == RTE_PROC_PRIMARY);
+
+ return container_of(sap, struct sfc_adapter, priv);
}
static inline struct sfc_adapter_shared *
int sfc_port_update_mac_stats(struct sfc_adapter *sa);
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);
#ifdef __cplusplus