sfc: move rx_rss_context_exclusive into struct efx_mcdi_filter_table

It's both set and used solely by mcdi_filters.c, so there's no reason
 for it to be in ef10-specific nic_data.

Signed-off-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/sfc/mcdi_filters.c b/drivers/net/ethernet/sfc/mcdi_filters.c
index d3c2e6eb319161302aadf574b53d4d1d5f78dc10..e99b3149c4aea10351abff932f302a933e1698c0 100644 (file)
--- a/drivers/net/ethernet/sfc/mcdi_filters.c
+++ b/drivers/net/ethernet/sfc/mcdi_filters.c
@@ -2031,14 +2031,14 @@ void efx_mcdi_rx_free_indir_table(struct efx_nic *efx)
 static int efx_mcdi_filter_rx_push_shared_rss_config(struct efx_nic *efx,
                                              unsigned *context_size)
 {
-       struct efx_ef10_nic_data *nic_data = efx->nic_data;
+       struct efx_mcdi_filter_table *table = efx->filter_state;
        int rc = efx_mcdi_filter_alloc_rss_context(efx, false, &efx->rss_context,
                                            context_size);
 
        if (rc != 0)
                return rc;
 
-       nic_data->rx_rss_context_exclusive = false;
+       table->rx_rss_context_exclusive = false;
        efx_set_default_rx_indir_table(efx, &efx->rss_context);
        return 0;
 }
@@ -2047,12 +2047,12 @@ static int efx_mcdi_filter_rx_push_exclusive_rss_config(struct efx_nic *efx,
                                                 const u32 *rx_indir_table,
                                                 const u8 *key)
 {
+       struct efx_mcdi_filter_table *table = efx->filter_state;
        u32 old_rx_rss_context = efx->rss_context.context_id;
-       struct efx_ef10_nic_data *nic_data = efx->nic_data;
        int rc;
 
        if (efx->rss_context.context_id == EFX_MCDI_RSS_CONTEXT_INVALID ||
-           !nic_data->rx_rss_context_exclusive) {
+           !table->rx_rss_context_exclusive) {
                rc = efx_mcdi_filter_alloc_rss_context(efx, true, &efx->rss_context,
                                                NULL);
                if (rc == -EOPNOTSUPP)
@@ -2069,7 +2069,7 @@ static int efx_mcdi_filter_rx_push_exclusive_rss_config(struct efx_nic *efx,
        if (efx->rss_context.context_id != old_rx_rss_context &&
            old_rx_rss_context != EFX_MCDI_RSS_CONTEXT_INVALID)
                WARN_ON(efx_mcdi_filter_free_rss_context(efx, old_rx_rss_context) != 0);
-       nic_data->rx_rss_context_exclusive = true;
+       table->rx_rss_context_exclusive = true;
        if (rx_indir_table != efx->rss_context.rx_indir_table)
                memcpy(efx->rss_context.rx_indir_table, rx_indir_table,
                       sizeof(efx->rss_context.rx_indir_table));

diff --git a/drivers/net/ethernet/sfc/mcdi_filters.h b/drivers/net/ethernet/sfc/mcdi_filters.h
index 15b5d62e36700b76628e6706f987abebbe0b12d3..03a8bf74c733714c2260358823f01f9f9204c9fd 100644 (file)
--- a/drivers/net/ethernet/sfc/mcdi_filters.h
+++ b/drivers/net/ethernet/sfc/mcdi_filters.h
@@ -55,6 +55,8 @@ struct efx_mcdi_filter_table {
        u32 rx_match_mcdi_flags[
                MC_CMD_GET_PARSER_DISP_INFO_OUT_SUPPORTED_MATCHES_MAXNUM * 2];
        unsigned int rx_match_count;
+       /* Our RSS context is exclusive (as opposed to shared) */
+       bool rx_rss_context_exclusive;
 
        struct rw_semaphore lock; /* Protects entries */
        struct {

diff --git a/drivers/net/ethernet/sfc/nic.h b/drivers/net/ethernet/sfc/nic.h
index 46583ba8fa242507e5e7ef45012d3a4a50f92919..8f73c5d996ebe3754c2964d5dbcf561caed7b552 100644 (file)
--- a/drivers/net/ethernet/sfc/nic.h
+++ b/drivers/net/ethernet/sfc/nic.h
@@ -368,7 +368,6 @@ enum {
  * @piobuf_size: size of a single PIO buffer
  * @must_restore_piobufs: Flag: PIO buffers have yet to be restored after MC
  *     reboot
- * @rx_rss_context_exclusive: Whether our RSS context is exclusive or shared
  * @stats: Hardware statistics
  * @workaround_35388: Flag: firmware supports workaround for bug 35388
  * @workaround_26807: Flag: firmware supports workaround for bug 26807
@@ -405,7 +404,6 @@ struct efx_ef10_nic_data {
        unsigned int piobuf_handle[EF10_TX_PIOBUF_COUNT];
        u16 piobuf_size;
        bool must_restore_piobufs;
-       bool rx_rss_context_exclusive;
        u64 stats[EF10_STAT_COUNT];
        bool workaround_35388;
        bool workaround_26807;