net/sfc/base: remove min/max defines for number of events

EF100/Riverhead has different min/max limits. So, these limits should
be a part of NIC config, not defines common for all NIC families.

Signed-off-by: Igor Romanov <igor.romanov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>

diff --git a/drivers/net/sfc/base/ef10_ev.c b/drivers/net/sfc/base/ef10_ev.c
index cdf835f..12125c6 100644 (file)
--- a/drivers/net/sfc/base/ef10_ev.c
+++ b/drivers/net/sfc/base/ef10_ev.c
@@ -123,7 +123,7 @@ efx_mcdi_init_evq(
 {
        efx_mcdi_req_t req;
        EFX_MCDI_DECLARE_BUF(payload,
-               MC_CMD_INIT_EVQ_IN_LEN(EFX_EVQ_NBUFS(EFX_EVQ_MAXNEVS)),
+               MC_CMD_INIT_EVQ_IN_LEN(EFX_EVQ_NBUFS(EF10_EVQ_MAXNEVS)),
                MC_CMD_INIT_EVQ_OUT_LEN);
        efx_qword_t *dma_addr;
        uint64_t addr;
@@ -259,7 +259,7 @@ efx_mcdi_init_evq_v2(
 {
        efx_mcdi_req_t req;
        EFX_MCDI_DECLARE_BUF(payload,
-               MC_CMD_INIT_EVQ_V2_IN_LEN(EFX_EVQ_NBUFS(EFX_EVQ_MAXNEVS)),
+               MC_CMD_INIT_EVQ_V2_IN_LEN(EFX_EVQ_NBUFS(EF10_EVQ_MAXNEVS)),
                MC_CMD_INIT_EVQ_V2_OUT_LEN);
        boolean_t interrupting;
        unsigned int evq_type;
@@ -446,11 +446,12 @@ ef10_ev_qcreate(
        efx_rc_t rc;
 
        _NOTE(ARGUNUSED(id))    /* buftbl id managed by MC */
-       EFX_STATIC_ASSERT(ISP2(EFX_EVQ_MAXNEVS));
-       EFX_STATIC_ASSERT(ISP2(EFX_EVQ_MINNEVS));
+       EFSYS_ASSERT(ISP2(encp->enc_evq_max_nevs));
+       EFSYS_ASSERT(ISP2(encp->enc_evq_min_nevs));
 
        if (!ISP2(ndescs) ||
-           (ndescs < EFX_EVQ_MINNEVS) || (ndescs > EFX_EVQ_MAXNEVS)) {
+           (ndescs < encp->enc_evq_min_nevs) ||
+           (ndescs > encp->enc_evq_max_nevs)) {
                rc = EINVAL;
                goto fail1;
        }
@@ -563,9 +564,9 @@ ef10_ev_qprime(
        rptr = count & eep->ee_mask;
 
        if (enp->en_nic_cfg.enc_bug35388_workaround) {
-               EFX_STATIC_ASSERT(EFX_EVQ_MINNEVS >
+               EFX_STATIC_ASSERT(EF10_EVQ_MINNEVS >
                    (1 << ERF_DD_EVQ_IND_RPTR_WIDTH));
-               EFX_STATIC_ASSERT(EFX_EVQ_MAXNEVS <
+               EFX_STATIC_ASSERT(EF10_EVQ_MAXNEVS <
                    (1 << 2 * ERF_DD_EVQ_IND_RPTR_WIDTH));
 
                EFX_POPULATE_DWORD_2(dword,

diff --git a/drivers/net/sfc/base/ef10_impl.h b/drivers/net/sfc/base/ef10_impl.h
index bf71b5a..44f7f63 100644 (file)
--- a/drivers/net/sfc/base/ef10_impl.h
+++ b/drivers/net/sfc/base/ef10_impl.h
@@ -11,6 +11,9 @@
 extern "C" {
 #endif
 
+#define        EF10_EVQ_MAXNEVS        32768
+#define        EF10_EVQ_MINNEVS        512
+
 #define        EF10_RXQ_MAXNDESCS      4096
 #define        EF10_RXQ_MINNDESCS      512
 

diff --git a/drivers/net/sfc/base/efx.h b/drivers/net/sfc/base/efx.h
index 06ce3d2..80a6419 100644 (file)
--- a/drivers/net/sfc/base/efx.h
+++ b/drivers/net/sfc/base/efx.h
@@ -1271,6 +1271,8 @@ typedef struct efx_nic_cfg_s {
        uint32_t                enc_evq_limit;
        uint32_t                enc_txq_limit;
        uint32_t                enc_rxq_limit;
+       uint32_t                enc_evq_max_nevs;
+       uint32_t                enc_evq_min_nevs;
        uint32_t                enc_rxq_max_ndescs;
        uint32_t                enc_rxq_min_ndescs;
        uint32_t                enc_txq_max_ndescs;
@@ -1976,6 +1978,10 @@ extern           void
 efx_ev_fini(
        __in            efx_nic_t *enp);
 
+/*
+ * These symbols are deprecated and will be removed.
+ * Use the fields from efx_nic_cfg_t instead.
+ */
 #define        EFX_EVQ_MAXNEVS         32768
 #define        EFX_EVQ_MINNEVS         512
 

diff --git a/drivers/net/sfc/base/efx_ev.c b/drivers/net/sfc/base/efx_ev.c
index 907c424..f1788ca 100644 (file)
--- a/drivers/net/sfc/base/efx_ev.c
+++ b/drivers/net/sfc/base/efx_ev.c
@@ -1285,11 +1285,12 @@ siena_ev_qcreate(
 
        _NOTE(ARGUNUSED(esmp))
 
-       EFX_STATIC_ASSERT(ISP2(EFX_EVQ_MAXNEVS));
-       EFX_STATIC_ASSERT(ISP2(EFX_EVQ_MINNEVS));
+       EFSYS_ASSERT(ISP2(encp->enc_evq_max_nevs));
+       EFSYS_ASSERT(ISP2(encp->enc_evq_min_nevs));
 
        if (!ISP2(ndescs) ||
-           (ndescs < EFX_EVQ_MINNEVS) || (ndescs > EFX_EVQ_MAXNEVS)) {
+           (ndescs < encp->enc_evq_min_nevs) ||
+           (ndescs > encp->enc_evq_max_nevs)) {
                rc = EINVAL;
                goto fail1;
        }
@@ -1304,9 +1305,10 @@ siena_ev_qcreate(
                goto fail3;
        }
 #endif
-       for (size = 0; (1 << size) <= (EFX_EVQ_MAXNEVS / EFX_EVQ_MINNEVS);
+       for (size = 0;
+           (1U << size) <= encp->enc_evq_max_nevs / encp->enc_evq_min_nevs;
            size++)
-               if ((1 << size) == (int)(ndescs / EFX_EVQ_MINNEVS))
+               if ((1U << size) == (uint32_t)ndescs / encp->enc_evq_min_nevs)
                        break;
        if (id + (1 << size) >= encp->enc_buftbl_limit) {
                rc = EINVAL;

diff --git a/drivers/net/sfc/base/hunt_nic.c b/drivers/net/sfc/base/hunt_nic.c
index ae8a008..755a377 100644 (file)
--- a/drivers/net/sfc/base/hunt_nic.c
+++ b/drivers/net/sfc/base/hunt_nic.c
@@ -190,6 +190,9 @@ hunt_board_cfg(
        encp->enc_rx_buf_align_start = 1;
        encp->enc_rx_buf_align_end = 64; /* RX DMA end padding */
 
+       encp->enc_evq_max_nevs = EF10_EVQ_MAXNEVS;
+       encp->enc_evq_min_nevs = EF10_EVQ_MINNEVS;
+
        encp->enc_rxq_max_ndescs = EF10_RXQ_MAXNDESCS;
        encp->enc_rxq_min_ndescs = EF10_RXQ_MINNDESCS;
 

diff --git a/drivers/net/sfc/base/medford2_nic.c b/drivers/net/sfc/base/medford2_nic.c
index 87c97b5..3274744 100644 (file)
--- a/drivers/net/sfc/base/medford2_nic.c
+++ b/drivers/net/sfc/base/medford2_nic.c
@@ -114,6 +114,9 @@ medford2_board_cfg(
        }
        encp->enc_rx_buf_align_end = end_padding;
 
+       encp->enc_evq_max_nevs = EF10_EVQ_MAXNEVS;
+       encp->enc_evq_min_nevs = EF10_EVQ_MINNEVS;
+
        encp->enc_rxq_max_ndescs = EF10_RXQ_MAXNDESCS;
        encp->enc_rxq_min_ndescs = EF10_RXQ_MINNDESCS;
 

diff --git a/drivers/net/sfc/base/medford_nic.c b/drivers/net/sfc/base/medford_nic.c
index c5d9197..cb107fe 100644 (file)
--- a/drivers/net/sfc/base/medford_nic.c
+++ b/drivers/net/sfc/base/medford_nic.c
@@ -112,6 +112,9 @@ medford_board_cfg(
        }
        encp->enc_rx_buf_align_end = end_padding;
 
+       encp->enc_evq_max_nevs = EF10_EVQ_MAXNEVS;
+       encp->enc_evq_min_nevs = EF10_EVQ_MINNEVS;
+
        encp->enc_rxq_max_ndescs = EF10_RXQ_MAXNDESCS;
        encp->enc_rxq_min_ndescs = EF10_RXQ_MINNDESCS;
 

diff --git a/drivers/net/sfc/base/siena_impl.h b/drivers/net/sfc/base/siena_impl.h
index 90f71d9..675e499 100644 (file)
--- a/drivers/net/sfc/base/siena_impl.h
+++ b/drivers/net/sfc/base/siena_impl.h
@@ -24,6 +24,9 @@ extern "C" {
 #endif
 #define        EFX_TXQ_DC_NDESCS(_dcsize)      (8 << (_dcsize))
 
+#define        SIENA_EVQ_MAXNEVS       32768
+#define        SIENA_EVQ_MINNEVS       512
+
 #define        SIENA_TXQ_MAXNDESCS     4096
 #define        SIENA_TXQ_MINNDESCS     512
 

diff --git a/drivers/net/sfc/base/siena_nic.c b/drivers/net/sfc/base/siena_nic.c
index 341abd8..4962a65 100644 (file)
--- a/drivers/net/sfc/base/siena_nic.c
+++ b/drivers/net/sfc/base/siena_nic.c
@@ -149,6 +149,9 @@ siena_board_cfg(
        encp->enc_rxq_limit = MIN(EFX_RXQ_LIMIT_TARGET, nrxq);
        encp->enc_txq_limit = MIN(EFX_TXQ_LIMIT_TARGET, ntxq);
 
+       encp->enc_evq_max_nevs = SIENA_EVQ_MAXNEVS;
+       encp->enc_evq_min_nevs = SIENA_EVQ_MINNEVS;
+
        encp->enc_rxq_max_ndescs = EF10_RXQ_MAXNDESCS;
        encp->enc_rxq_min_ndescs = EF10_RXQ_MINNDESCS;