net/sfc/base: move Rx config to ef10 NIC board config

Signed-off-by: Andy Moreton <amoreton@solarflare.com>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>

diff --git a/drivers/net/sfc/base/ef10_nic.c b/drivers/net/sfc/base/ef10_nic.c
index e7fa7b8f65b667e1ea95dfd05e5f827240f2ec93..7223b21da2a8727a466ff56878b59be65ec730b5 100644 (file)
--- a/drivers/net/sfc/base/ef10_nic.c
+++ b/drivers/net/sfc/base/ef10_nic.c
@@ -1635,6 +1635,17 @@ ef10_nic_board_cfg(
        if ((rc = ef10_get_datapath_caps(enp)) != 0)
                goto fail8;
 
+       /* Alignment for WPTR updates */
+       encp->enc_rx_push_align = EF10_RX_WPTR_ALIGN;
+
+       /*
+        * Maximum number of exclusive RSS contexts. EF10 hardware supports 64
+        * in total, but 6 are reserved for shared contexts. They are a global
+        * resource so not all may be available.
+        */
+       encp->enc_rx_scale_max_exclusive_contexts = 64 - 6;
+
+
        /* Get remaining controller-specific board config */
        if ((rc = enop->eno_board_cfg(enp)) != 0)
                if (rc != EACCES)

diff --git a/drivers/net/sfc/base/hunt_nic.c b/drivers/net/sfc/base/hunt_nic.c
index 95b48a7ae2535e960f4511f030f83c133731758f..ef660f79c2c0364e9058098c7cd035f1663be58a 100644 (file)
--- a/drivers/net/sfc/base/hunt_nic.c
+++ b/drivers/net/sfc/base/hunt_nic.c
@@ -205,16 +205,6 @@ hunt_board_cfg(
        encp->enc_rx_buf_align_start = 1;
        encp->enc_rx_buf_align_end = 64; /* RX DMA end padding */
 
-       /* Alignment for WPTR updates */
-       encp->enc_rx_push_align = EF10_RX_WPTR_ALIGN;
-
-       /*
-        * Maximum number of exclusive RSS contexts which can be allocated. The
-        * hardware supports 64, but 6 are reserved for shared contexts. They
-        * are a global resource so not all may be available.
-        */
-       encp->enc_rx_scale_max_exclusive_contexts = 58;
-
        encp->enc_tx_dma_desc_size_max = EFX_MASK32(ESF_DZ_RX_KER_BYTE_CNT);
        /* No boundary crossing limits */
        encp->enc_tx_dma_desc_boundary = 0;

diff --git a/drivers/net/sfc/base/medford2_nic.c b/drivers/net/sfc/base/medford2_nic.c
index f383b3146e5b645ec74ec80015618290e183dfac..ee9cf68acd3ebafc5c1ae6340de3c4058ae274a8 100644 (file)
--- a/drivers/net/sfc/base/medford2_nic.c
+++ b/drivers/net/sfc/base/medford2_nic.c
@@ -137,16 +137,6 @@ medford2_board_cfg(
        }
        encp->enc_rx_buf_align_end = end_padding;
 
-       /* Alignment for WPTR updates */
-       encp->enc_rx_push_align = EF10_RX_WPTR_ALIGN;
-
-       /*
-        * Maximum number of exclusive RSS contexts which can be allocated. The
-        * hardware supports 64, but 6 are reserved for shared contexts. They
-        * are a global resource so not all may be available.
-        */
-       encp->enc_rx_scale_max_exclusive_contexts = 58;
-
        encp->enc_tx_dma_desc_size_max = EFX_MASK32(ESF_DZ_RX_KER_BYTE_CNT);
        /* No boundary crossing limits */
        encp->enc_tx_dma_desc_boundary = 0;

diff --git a/drivers/net/sfc/base/medford_nic.c b/drivers/net/sfc/base/medford_nic.c
index 5e9d391337f86d282f2ba5020b46ef83535fa6dc..add0af0d9d46ef7788966f4992da15cecaed7913 100644 (file)
--- a/drivers/net/sfc/base/medford_nic.c
+++ b/drivers/net/sfc/base/medford_nic.c
@@ -136,16 +136,6 @@ medford_board_cfg(
        }
        encp->enc_rx_buf_align_end = end_padding;
 
-       /* Alignment for WPTR updates */
-       encp->enc_rx_push_align = EF10_RX_WPTR_ALIGN;
-
-       /*
-        * Maximum number of exclusive RSS contexts which can be allocated. The
-        * hardware supports 64, but 6 are reserved for shared contexts. They
-        * are a global resource so not all may be available.
-        */
-       encp->enc_rx_scale_max_exclusive_contexts = 58;
-
        encp->enc_tx_dma_desc_size_max = EFX_MASK32(ESF_DZ_RX_KER_BYTE_CNT);
        /* No boundary crossing limits */
        encp->enc_tx_dma_desc_boundary = 0;