net/sfc/base: improve names for RXQ descriptor counts

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

diff --git a/drivers/net/sfc/base/ef10_impl.h b/drivers/net/sfc/base/ef10_impl.h
index 8adde95..deaadcb 100644 (file)
--- a/drivers/net/sfc/base/ef10_impl.h
+++ b/drivers/net/sfc/base/ef10_impl.h
@@ -954,14 +954,14 @@ ef10_rx_prefix_pktlen(
        __in            uint8_t *buffer,
        __out           uint16_t *lengthp);
 
-extern                 void
+extern                         void
 ef10_rx_qpost(
-       __in            efx_rxq_t *erp,
-       __in_ecount(n)  efsys_dma_addr_t *addrp,
-       __in            size_t size,
-       __in            unsigned int n,
-       __in            unsigned int completed,
-       __in            unsigned int added);
+       __in                    efx_rxq_t *erp,
+       __in_ecount(ndescs)     efsys_dma_addr_t *addrp,
+       __in                    size_t size,
+       __in                    unsigned int ndescs,
+       __in                    unsigned int completed,
+       __in                    unsigned int added);
 
 extern                 void
 ef10_rx_qpush(
@@ -984,7 +984,7 @@ ef10_rx_qcreate(
        __in            unsigned int label,
        __in            efx_rxq_type_t type,
        __in            efsys_mem_t *esmp,
-       __in            size_t n,
+       __in            size_t ndescs,
        __in            uint32_t id,
        __in            efx_evq_t *eep,
        __in            efx_rxq_t *erp);

diff --git a/drivers/net/sfc/base/ef10_rx.c b/drivers/net/sfc/base/ef10_rx.c
index 2942d03..cebc34f 100644 (file)
--- a/drivers/net/sfc/base/ef10_rx.c
+++ b/drivers/net/sfc/base/ef10_rx.c
@@ -38,7 +38,7 @@
 static __checkReturn   efx_rc_t
 efx_mcdi_init_rxq(
        __in            efx_nic_t *enp,
-       __in            uint32_t size,
+       __in            uint32_t ndescs,
        __in            uint32_t target_evq,
        __in            uint32_t label,
        __in            uint32_t instance,
@@ -50,7 +50,7 @@ efx_mcdi_init_rxq(
        efx_mcdi_req_t req;
        uint8_t payload[MAX(MC_CMD_INIT_RXQ_EXT_IN_LEN,
                            MC_CMD_INIT_RXQ_EXT_OUT_LEN)];
-       int npages = EFX_RXQ_NBUFS(size);
+       int npages = EFX_RXQ_NBUFS(ndescs);
        int i;
        efx_qword_t *dma_addr;
        uint64_t addr;
@@ -58,7 +58,7 @@ efx_mcdi_init_rxq(
        uint32_t dma_mode;
        boolean_t want_outer_classes;
 
-       EFSYS_ASSERT3U(size, <=, EFX_RXQ_MAXNDESCS);
+       EFSYS_ASSERT3U(ndescs, <=, EFX_RXQ_MAXNDESCS);
 
        if (ps_bufsize > 0)
                dma_mode = MC_CMD_INIT_RXQ_EXT_IN_PACKED_STREAM;
@@ -91,7 +91,7 @@ efx_mcdi_init_rxq(
        req.emr_out_buf = payload;
        req.emr_out_length = MC_CMD_INIT_RXQ_EXT_OUT_LEN;
 
-       MCDI_IN_SET_DWORD(req, INIT_RXQ_EXT_IN_SIZE, size);
+       MCDI_IN_SET_DWORD(req, INIT_RXQ_EXT_IN_SIZE, ndescs);
        MCDI_IN_SET_DWORD(req, INIT_RXQ_EXT_IN_TARGET_EVQ, target_evq);
        MCDI_IN_SET_DWORD(req, INIT_RXQ_EXT_IN_LABEL, label);
        MCDI_IN_SET_DWORD(req, INIT_RXQ_EXT_IN_INSTANCE, instance);
@@ -735,14 +735,14 @@ ef10_rx_prefix_hash(
 #define        EFX_RXQ_PACKED_STREAM_FAKE_BUF_SIZE 32
 #endif
 
-                       void
+                               void
 ef10_rx_qpost(
-       __in            efx_rxq_t *erp,
-       __in_ecount(n)  efsys_dma_addr_t *addrp,
-       __in            size_t size,
-       __in            unsigned int n,
-       __in            unsigned int completed,
-       __in            unsigned int added)
+       __in                    efx_rxq_t *erp,
+       __in_ecount(ndescs)     efsys_dma_addr_t *addrp,
+       __in                    size_t size,
+       __in                    unsigned int ndescs,
+       __in                    unsigned int completed,
+       __in                    unsigned int added)
 {
        efx_qword_t qword;
        unsigned int i;
@@ -759,11 +759,11 @@ ef10_rx_qpost(
 #endif
 
        /* The client driver must not overfill the queue */
-       EFSYS_ASSERT3U(added - completed + n, <=,
+       EFSYS_ASSERT3U(added - completed + ndescs, <=,
            EFX_RXQ_LIMIT(erp->er_mask + 1));
 
        id = added & (erp->er_mask);
-       for (i = 0; i < n; i++) {
+       for (i = 0; i < ndescs; i++) {
                EFSYS_PROBE4(rx_post, unsigned int, erp->er_index,
                    unsigned int, id, efsys_dma_addr_t, addrp[i],
                    size_t, size);
@@ -941,7 +941,7 @@ ef10_rx_qcreate(
        __in            unsigned int label,
        __in            efx_rxq_type_t type,
        __in            efsys_mem_t *esmp,
-       __in            size_t n,
+       __in            size_t ndescs,
        __in            uint32_t id,
        __in            efx_evq_t *eep,
        __in            efx_rxq_t *erp)
@@ -960,7 +960,8 @@ ef10_rx_qcreate(
        EFX_STATIC_ASSERT(ISP2(EFX_RXQ_MAXNDESCS));
        EFX_STATIC_ASSERT(ISP2(EFX_RXQ_MINNDESCS));
 
-       if (!ISP2(n) || (n < EFX_RXQ_MINNDESCS) || (n > EFX_RXQ_MAXNDESCS)) {
+       if (!ISP2(ndescs) ||
+           (ndescs < EFX_RXQ_MINNDESCS) || (ndescs > EFX_RXQ_MAXNDESCS)) {
                rc = EINVAL;
                goto fail1;
        }
@@ -1020,7 +1021,7 @@ ef10_rx_qcreate(
        else
                disable_scatter = encp->enc_rx_disable_scatter_supported;
 
-       if ((rc = efx_mcdi_init_rxq(enp, n, eep->ee_index, label, index,
+       if ((rc = efx_mcdi_init_rxq(enp, ndescs, eep->ee_index, label, index,
                    esmp, disable_scatter, ps_buf_size)) != 0)
                goto fail6;
 

diff --git a/drivers/net/sfc/base/efx.h b/drivers/net/sfc/base/efx.h
index 14d870a..5b3682c 100644 (file)
--- a/drivers/net/sfc/base/efx.h
+++ b/drivers/net/sfc/base/efx.h
@@ -2014,7 +2014,7 @@ efx_rx_qcreate(
        __in            unsigned int label,
        __in            efx_rxq_type_t type,
        __in            efsys_mem_t *esmp,
-       __in            size_t n,
+       __in            size_t ndescs,
        __in            uint32_t id,
        __in            efx_evq_t *eep,
        __deref_out     efx_rxq_t **erpp);
@@ -2029,14 +2029,14 @@ typedef struct efx_desc_s {
        efx_qword_t ed_eq;
 } efx_desc_t;
 
-extern                 void
+extern                         void
 efx_rx_qpost(
-       __in            efx_rxq_t *erp,
-       __in_ecount(n)  efsys_dma_addr_t *addrp,
-       __in            size_t size,
-       __in            unsigned int n,
-       __in            unsigned int completed,
-       __in            unsigned int added);
+       __in                    efx_rxq_t *erp,
+       __in_ecount(ndescs)     efsys_dma_addr_t *addrp,
+       __in                    size_t size,
+       __in                    unsigned int ndescs,
+       __in                    unsigned int completed,
+       __in                    unsigned int added);
 
 extern         void
 efx_rx_qpush(

diff --git a/drivers/net/sfc/base/efx_rx.c b/drivers/net/sfc/base/efx_rx.c
index e1a9777..1a3b6a5 100644 (file)
--- a/drivers/net/sfc/base/efx_rx.c
+++ b/drivers/net/sfc/base/efx_rx.c
@@ -86,14 +86,14 @@ siena_rx_prefix_pktlen(
        __in            uint8_t *buffer,
        __out           uint16_t *lengthp);
 
-static                 void
+static                         void
 siena_rx_qpost(
-       __in            efx_rxq_t *erp,
-       __in_ecount(n)  efsys_dma_addr_t *addrp,
-       __in            size_t size,
-       __in            unsigned int n,
-       __in            unsigned int completed,
-       __in            unsigned int added);
+       __in                    efx_rxq_t *erp,
+       __in_ecount(ndescs)     efsys_dma_addr_t *addrp,
+       __in                    size_t size,
+       __in                    unsigned int ndescs,
+       __in                    unsigned int completed,
+       __in                    unsigned int added);
 
 static                 void
 siena_rx_qpush(
@@ -132,7 +132,7 @@ siena_rx_qcreate(
        __in            unsigned int label,
        __in            efx_rxq_type_t type,
        __in            efsys_mem_t *esmp,
-       __in            size_t n,
+       __in            size_t ndescs,
        __in            uint32_t id,
        __in            efx_evq_t *eep,
        __in            efx_rxq_t *erp);
@@ -512,21 +512,21 @@ fail1:
 }
 #endif /* EFSYS_OPT_RX_SCALE */
 
-                       void
+                               void
 efx_rx_qpost(
-       __in            efx_rxq_t *erp,
-       __in_ecount(n)  efsys_dma_addr_t *addrp,
-       __in            size_t size,
-       __in            unsigned int n,
-       __in            unsigned int completed,
-       __in            unsigned int added)
+       __in                    efx_rxq_t *erp,
+       __in_ecount(ndescs)     efsys_dma_addr_t *addrp,
+       __in                    size_t size,
+       __in                    unsigned int ndescs,
+       __in                    unsigned int completed,
+       __in                    unsigned int added)
 {
        efx_nic_t *enp = erp->er_enp;
        const efx_rx_ops_t *erxop = enp->en_erxop;
 
        EFSYS_ASSERT3U(erp->er_magic, ==, EFX_RXQ_MAGIC);
 
-       erxop->erxo_qpost(erp, addrp, size, n, completed, added);
+       erxop->erxo_qpost(erp, addrp, size, ndescs, completed, added);
 }
 
 #if EFSYS_OPT_RX_PACKED_STREAM
@@ -617,7 +617,7 @@ efx_rx_qcreate(
        __in            unsigned int label,
        __in            efx_rxq_type_t type,
        __in            efsys_mem_t *esmp,
-       __in            size_t n,
+       __in            size_t ndescs,
        __in            uint32_t id,
        __in            efx_evq_t *eep,
        __deref_out     efx_rxq_t **erpp)
@@ -640,10 +640,10 @@ efx_rx_qcreate(
        erp->er_magic = EFX_RXQ_MAGIC;
        erp->er_enp = enp;
        erp->er_index = index;
-       erp->er_mask = n - 1;
+       erp->er_mask = ndescs - 1;
        erp->er_esmp = esmp;
 
-       if ((rc = erxop->erxo_qcreate(enp, index, label, type, esmp, n, id,
+       if ((rc = erxop->erxo_qcreate(enp, index, label, type, esmp, ndescs, id,
            eep, erp)) != 0)
                goto fail2;
 
@@ -1163,14 +1163,14 @@ siena_rx_prefix_pktlen(
 }
 
 
-static                 void
+static                         void
 siena_rx_qpost(
-       __in            efx_rxq_t *erp,
-       __in_ecount(n)  efsys_dma_addr_t *addrp,
-       __in            size_t size,
-       __in            unsigned int n,
-       __in            unsigned int completed,
-       __in            unsigned int added)
+       __in                    efx_rxq_t *erp,
+       __in_ecount(ndescs)     efsys_dma_addr_t *addrp,
+       __in                    size_t size,
+       __in                    unsigned int ndescs,
+       __in                    unsigned int completed,
+       __in                    unsigned int added)
 {
        efx_qword_t qword;
        unsigned int i;
@@ -1178,11 +1178,11 @@ siena_rx_qpost(
        unsigned int id;
 
        /* The client driver must not overfill the queue */
-       EFSYS_ASSERT3U(added - completed + n, <=,
+       EFSYS_ASSERT3U(added - completed + ndescs, <=,
            EFX_RXQ_LIMIT(erp->er_mask + 1));
 
        id = added & (erp->er_mask);
-       for (i = 0; i < n; i++) {
+       for (i = 0; i < ndescs; i++) {
                EFSYS_PROBE4(rx_post, unsigned int, erp->er_index,
                    unsigned int, id, efsys_dma_addr_t, addrp[i],
                    size_t, size);
@@ -1304,7 +1304,7 @@ siena_rx_qcreate(
        __in            unsigned int label,
        __in            efx_rxq_type_t type,
        __in            efsys_mem_t *esmp,
-       __in            size_t n,
+       __in            size_t ndescs,
        __in            uint32_t id,
        __in            efx_evq_t *eep,
        __in            efx_rxq_t *erp)
@@ -1325,7 +1325,8 @@ siena_rx_qcreate(
        EFX_STATIC_ASSERT(ISP2(EFX_RXQ_MAXNDESCS));
        EFX_STATIC_ASSERT(ISP2(EFX_RXQ_MINNDESCS));
 
-       if (!ISP2(n) || (n < EFX_RXQ_MINNDESCS) || (n > EFX_RXQ_MAXNDESCS)) {
+       if (!ISP2(ndescs) ||
+           (ndescs < EFX_RXQ_MINNDESCS) || (ndescs > EFX_RXQ_MAXNDESCS)) {
                rc = EINVAL;
                goto fail1;
        }
@@ -1335,7 +1336,7 @@ siena_rx_qcreate(
        }
        for (size = 0; (1 << size) <= (EFX_RXQ_MAXNDESCS / EFX_RXQ_MINNDESCS);
            size++)
-               if ((1 << size) == (int)(n / EFX_RXQ_MINNDESCS))
+               if ((1 << size) == (int)(ndescs / EFX_RXQ_MINNDESCS))
                        break;
        if (id + (1 << size) >= encp->enc_buftbl_limit) {
                rc = EINVAL;