net/sfc/base: improve names for TXQ 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 deaadcb..1d3296f 100644 (file)
--- a/drivers/net/sfc/base/ef10_impl.h
+++ b/drivers/net/sfc/base/ef10_impl.h
@@ -668,7 +668,7 @@ ef10_tx_qcreate(
        __in            unsigned int index,
        __in            unsigned int label,
        __in            efsys_mem_t *esmp,
-       __in            size_t n,
+       __in            size_t ndescs,
        __in            uint32_t id,
        __in            uint16_t flags,
        __in            efx_evq_t *eep,
@@ -679,13 +679,13 @@ extern            void
 ef10_tx_qdestroy(
        __in            efx_txq_t *etp);
 
-extern __checkReturn   efx_rc_t
+extern __checkReturn           efx_rc_t
 ef10_tx_qpost(
-       __in            efx_txq_t *etp,
-       __in_ecount(n)  efx_buffer_t *eb,
-       __in            unsigned int n,
-       __in            unsigned int completed,
-       __inout         unsigned int *addedp);
+       __in                    efx_txq_t *etp,
+       __in_ecount(ndescs)     efx_buffer_t *ebp,
+       __in                    unsigned int ndescs,
+       __in                    unsigned int completed,
+       __inout                 unsigned int *addedp);
 
 extern                 void
 ef10_tx_qpush(

diff --git a/drivers/net/sfc/base/ef10_tx.c b/drivers/net/sfc/base/ef10_tx.c
index a708b8f..14b23d0 100644 (file)
--- a/drivers/net/sfc/base/ef10_tx.c
+++ b/drivers/net/sfc/base/ef10_tx.c
@@ -47,7 +47,7 @@
 static __checkReturn   efx_rc_t
 efx_mcdi_init_txq(
        __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,
@@ -66,7 +66,7 @@ efx_mcdi_init_txq(
        EFSYS_ASSERT(EFX_TXQ_MAX_BUFS >=
            EFX_TXQ_NBUFS(enp->en_nic_cfg.enc_txq_max_ndescs));
 
-       npages = EFX_TXQ_NBUFS(size);
+       npages = EFX_TXQ_NBUFS(ndescs);
        if (MC_CMD_INIT_TXQ_IN_LEN(npages) > sizeof (payload)) {
                rc = EINVAL;
                goto fail1;
@@ -79,7 +79,7 @@ efx_mcdi_init_txq(
        req.emr_out_buf = payload;
        req.emr_out_length = MC_CMD_INIT_TXQ_OUT_LEN;
 
-       MCDI_IN_SET_DWORD(req, INIT_TXQ_IN_SIZE, size);
+       MCDI_IN_SET_DWORD(req, INIT_TXQ_IN_SIZE, ndescs);
        MCDI_IN_SET_DWORD(req, INIT_TXQ_IN_TARGET_EVQ, target_evq);
        MCDI_IN_SET_DWORD(req, INIT_TXQ_IN_LABEL, label);
        MCDI_IN_SET_DWORD(req, INIT_TXQ_IN_INSTANCE, instance);
@@ -191,7 +191,7 @@ ef10_tx_qcreate(
        __in            unsigned int index,
        __in            unsigned int label,
        __in            efsys_mem_t *esmp,
-       __in            size_t n,
+       __in            size_t ndescs,
        __in            uint32_t id,
        __in            uint16_t flags,
        __in            efx_evq_t *eep,
@@ -212,8 +212,8 @@ ef10_tx_qcreate(
                goto fail1;
        }
 
-       if ((rc = efx_mcdi_init_txq(enp, n, eep->ee_index, label, index, flags,
-           esmp)) != 0)
+       if ((rc = efx_mcdi_init_txq(enp, ndescs, eep->ee_index, label, index,
+           flags, esmp)) != 0)
                goto fail2;
 
        /*
@@ -433,24 +433,24 @@ fail1:
        return (rc);
 }
 
-       __checkReturn   efx_rc_t
+       __checkReturn           efx_rc_t
 ef10_tx_qpost(
-       __in            efx_txq_t *etp,
-       __in_ecount(n)  efx_buffer_t *eb,
-       __in            unsigned int n,
-       __in            unsigned int completed,
-       __inout         unsigned int *addedp)
+       __in                    efx_txq_t *etp,
+       __in_ecount(ndescs)     efx_buffer_t *eb,
+       __in                    unsigned int ndescs,
+       __in                    unsigned int completed,
+       __inout                 unsigned int *addedp)
 {
        unsigned int added = *addedp;
        unsigned int i;
        efx_rc_t rc;
 
-       if (added - completed + n > EFX_TXQ_LIMIT(etp->et_mask + 1)) {
+       if (added - completed + ndescs > EFX_TXQ_LIMIT(etp->et_mask + 1)) {
                rc = ENOSPC;
                goto fail1;
        }
 
-       for (i = 0; i < n; i++) {
+       for (i = 0; i < ndescs; i++) {
                efx_buffer_t *ebp = &eb[i];
                efsys_dma_addr_t addr = ebp->eb_addr;
                size_t size = ebp->eb_size;
@@ -556,24 +556,24 @@ ef10_tx_qpush(
        }
 }
 
-       __checkReturn   efx_rc_t
+       __checkReturn           efx_rc_t
 ef10_tx_qdesc_post(
-       __in            efx_txq_t *etp,
-       __in_ecount(n)  efx_desc_t *ed,
-       __in            unsigned int n,
-       __in            unsigned int completed,
-       __inout         unsigned int *addedp)
+       __in                    efx_txq_t *etp,
+       __in_ecount(ndescs)     efx_desc_t *ed,
+       __in                    unsigned int ndescs,
+       __in                    unsigned int completed,
+       __inout                 unsigned int *addedp)
 {
        unsigned int added = *addedp;
        unsigned int i;
        efx_rc_t rc;
 
-       if (added - completed + n > EFX_TXQ_LIMIT(etp->et_mask + 1)) {
+       if (added - completed + ndescs > EFX_TXQ_LIMIT(etp->et_mask + 1)) {
                rc = ENOSPC;
                goto fail1;
        }
 
-       for (i = 0; i < n; i++) {
+       for (i = 0; i < ndescs; i++) {
                efx_desc_t *edp = &ed[i];
                unsigned int id;
                size_t offset;
@@ -585,7 +585,7 @@ ef10_tx_qdesc_post(
        }
 
        EFSYS_PROBE3(tx_desc_post, unsigned int, etp->et_index,
-                   unsigned int, added, unsigned int, n);
+                   unsigned int, added, unsigned int, ndescs);
 
        EFX_TX_QSTAT_INCR(etp, TX_POST);
 

diff --git a/drivers/net/sfc/base/efx.h b/drivers/net/sfc/base/efx.h
index 5b3682c..399d172 100644 (file)
--- a/drivers/net/sfc/base/efx.h
+++ b/drivers/net/sfc/base/efx.h
@@ -2126,13 +2126,13 @@ efx_tx_qcreate(
        __deref_out     efx_txq_t **etpp,
        __out           unsigned int *addedp);
 
-extern __checkReturn   efx_rc_t
+extern __checkReturn           efx_rc_t
 efx_tx_qpost(
-       __in            efx_txq_t *etp,
-       __in_ecount(n)  efx_buffer_t *eb,
-       __in            unsigned int n,
-       __in            unsigned int completed,
-       __inout         unsigned int *addedp);
+       __in                    efx_txq_t *etp,
+       __in_ecount(ndescs)     efx_buffer_t *eb,
+       __in                    unsigned int ndescs,
+       __in                    unsigned int completed,
+       __inout                 unsigned int *addedp);
 
 extern __checkReturn   efx_rc_t
 efx_tx_qpace(

diff --git a/drivers/net/sfc/base/efx_tx.c b/drivers/net/sfc/base/efx_tx.c
index 8044a09..a68babc 100644 (file)
--- a/drivers/net/sfc/base/efx_tx.c
+++ b/drivers/net/sfc/base/efx_tx.c
@@ -57,7 +57,7 @@ siena_tx_qcreate(
        __in            unsigned int index,
        __in            unsigned int label,
        __in            efsys_mem_t *esmp,
-       __in            size_t n,
+       __in            size_t ndescs,
        __in            uint32_t id,
        __in            uint16_t flags,
        __in            efx_evq_t *eep,
@@ -68,13 +68,13 @@ static              void
 siena_tx_qdestroy(
        __in    efx_txq_t *etp);
 
-static __checkReturn   efx_rc_t
+static __checkReturn           efx_rc_t
 siena_tx_qpost(
-       __in            efx_txq_t *etp,
-       __in_ecount(n)  efx_buffer_t *eb,
-       __in            unsigned int n,
-       __in            unsigned int completed,
-       __inout         unsigned int *addedp);
+       __in                    efx_txq_t *etp,
+       __in_ecount(ndescs)     efx_buffer_t *eb,
+       __in                    unsigned int ndescs,
+       __in                    unsigned int completed,
+       __inout                 unsigned int *addedp);
 
 static                 void
 siena_tx_qpush(
@@ -95,13 +95,13 @@ static                      void
 siena_tx_qenable(
        __in    efx_txq_t *etp);
 
-       __checkReturn   efx_rc_t
+       __checkReturn           efx_rc_t
 siena_tx_qdesc_post(
-       __in            efx_txq_t *etp,
-       __in_ecount(n)  efx_desc_t *ed,
-       __in            unsigned int n,
-       __in            unsigned int completed,
-       __inout         unsigned int *addedp);
+       __in                    efx_txq_t *etp,
+       __in_ecount(ndescs)     efx_desc_t *ed,
+       __in                    unsigned int ndescs,
+       __in                    unsigned int completed,
+       __inout                 unsigned int *addedp);
 
        void
 siena_tx_qdesc_dma_create(
@@ -290,7 +290,7 @@ efx_tx_qcreate(
        __in            unsigned int index,
        __in            unsigned int label,
        __in            efsys_mem_t *esmp,
-       __in            size_t n,
+       __in            size_t ndescs,
        __in            uint32_t id,
        __in            uint16_t flags,
        __in            efx_evq_t *eep,
@@ -318,14 +318,14 @@ efx_tx_qcreate(
        etp->et_magic = EFX_TXQ_MAGIC;
        etp->et_enp = enp;
        etp->et_index = index;
-       etp->et_mask = n - 1;
+       etp->et_mask = ndescs - 1;
        etp->et_esmp = esmp;
 
        /* Initial descriptor index may be modified by etxo_qcreate */
        *addedp = 0;
 
        if ((rc = etxop->etxo_qcreate(enp, index, label, esmp,
-           n, id, flags, eep, etp, addedp)) != 0)
+           ndescs, id, flags, eep, etp, addedp)) != 0)
                goto fail2;
 
        enp->en_tx_qcount++;
@@ -359,13 +359,13 @@ efx_tx_qdestroy(
        EFSYS_KMEM_FREE(enp->en_esip, sizeof (efx_txq_t), etp);
 }
 
-       __checkReturn   efx_rc_t
+       __checkReturn           efx_rc_t
 efx_tx_qpost(
-       __in            efx_txq_t *etp,
-       __in_ecount(n)  efx_buffer_t *eb,
-       __in            unsigned int n,
-       __in            unsigned int completed,
-       __inout         unsigned int *addedp)
+       __in                    efx_txq_t *etp,
+       __in_ecount(ndescs)     efx_buffer_t *eb,
+       __in                    unsigned int ndescs,
+       __in                    unsigned int completed,
+       __inout                 unsigned int *addedp)
 {
        efx_nic_t *enp = etp->et_enp;
        const efx_tx_ops_t *etxop = enp->en_etxop;
@@ -373,8 +373,7 @@ efx_tx_qpost(
 
        EFSYS_ASSERT3U(etp->et_magic, ==, EFX_TXQ_MAGIC);
 
-       if ((rc = etxop->etxo_qpost(etp, eb,
-           n, completed, addedp)) != 0)
+       if ((rc = etxop->etxo_qpost(etp, eb, ndescs, completed, addedp)) != 0)
                goto fail1;
 
        return (0);
@@ -550,13 +549,13 @@ fail1:
        return (rc);
 }
 
-       __checkReturn   efx_rc_t
+       __checkReturn           efx_rc_t
 efx_tx_qdesc_post(
-       __in            efx_txq_t *etp,
-       __in_ecount(n)  efx_desc_t *ed,
-       __in            unsigned int n,
-       __in            unsigned int completed,
-       __inout         unsigned int *addedp)
+       __in                    efx_txq_t *etp,
+       __in_ecount(ndescs)     efx_desc_t *ed,
+       __in                    unsigned int ndescs,
+       __in                    unsigned int completed,
+       __inout                 unsigned int *addedp)
 {
        efx_nic_t *enp = etp->et_enp;
        const efx_tx_ops_t *etxop = enp->en_etxop;
@@ -565,7 +564,7 @@ efx_tx_qdesc_post(
        EFSYS_ASSERT3U(etp->et_magic, ==, EFX_TXQ_MAGIC);
 
        if ((rc = etxop->etxo_qdesc_post(etp, ed,
-           n, completed, addedp)) != 0)
+           ndescs, completed, addedp)) != 0)
                goto fail1;
 
        return (0);
@@ -724,22 +723,22 @@ siena_tx_init(
                _NOTE(CONSTANTCONDITION)                                \
        } while (B_FALSE)
 
-static __checkReturn   efx_rc_t
+static __checkReturn           efx_rc_t
 siena_tx_qpost(
-       __in            efx_txq_t *etp,
-       __in_ecount(n)  efx_buffer_t *eb,
-       __in            unsigned int n,
-       __in            unsigned int completed,
-       __inout         unsigned int *addedp)
+       __in                    efx_txq_t *etp,
+       __in_ecount(ndescs)     efx_buffer_t *eb,
+       __in                    unsigned int ndescs,
+       __in                    unsigned int completed,
+       __inout                 unsigned int *addedp)
 {
        unsigned int added = *addedp;
        unsigned int i;
        int rc = ENOSPC;
 
-       if (added - completed + n > EFX_TXQ_LIMIT(etp->et_mask + 1))
+       if (added - completed + ndescs > EFX_TXQ_LIMIT(etp->et_mask + 1))
                goto fail1;
 
-       for (i = 0; i < n; i++) {
+       for (i = 0; i < ndescs; i++) {
                efx_buffer_t *ebp = &eb[i];
                efsys_dma_addr_t start = ebp->eb_addr;
                size_t size = ebp->eb_size;
@@ -889,7 +888,7 @@ siena_tx_qcreate(
        __in            unsigned int index,
        __in            unsigned int label,
        __in            efsys_mem_t *esmp,
-       __in            size_t n,
+       __in            size_t ndescs,
        __in            uint32_t id,
        __in            uint16_t flags,
        __in            efx_evq_t *eep,
@@ -911,7 +910,8 @@ siena_tx_qcreate(
        EFSYS_ASSERT(ISP2(encp->enc_txq_max_ndescs));
        EFX_STATIC_ASSERT(ISP2(EFX_TXQ_MINNDESCS));
 
-       if (!ISP2(n) || (n < EFX_TXQ_MINNDESCS) || (n > EFX_EVQ_MAXNEVS)) {
+       if (!ISP2(ndescs) ||
+           (ndescs < EFX_TXQ_MINNDESCS) || (ndescs > EFX_EVQ_MAXNEVS)) {
                rc = EINVAL;
                goto fail1;
        }
@@ -922,7 +922,7 @@ siena_tx_qcreate(
        for (size = 0;
            (1 << size) <= (int)(encp->enc_txq_max_ndescs / EFX_TXQ_MINNDESCS);
            size++)
-               if ((1 << size) == (int)(n / EFX_TXQ_MINNDESCS))
+               if ((1 << size) == (int)(ndescs / EFX_TXQ_MINNDESCS))
                        break;
        if (id + (1 << size) >= encp->enc_buftbl_limit) {
                rc = EINVAL;
@@ -969,24 +969,24 @@ fail1:
        return (rc);
 }
 
-       __checkReturn   efx_rc_t
+       __checkReturn           efx_rc_t
 siena_tx_qdesc_post(
-       __in            efx_txq_t *etp,
-       __in_ecount(n)  efx_desc_t *ed,
-       __in            unsigned int n,
-       __in            unsigned int completed,
-       __inout         unsigned int *addedp)
+       __in                    efx_txq_t *etp,
+       __in_ecount(ndescs)     efx_desc_t *ed,
+       __in                    unsigned int ndescs,
+       __in                    unsigned int completed,
+       __inout                 unsigned int *addedp)
 {
        unsigned int added = *addedp;
        unsigned int i;
        efx_rc_t rc;
 
-       if (added - completed + n > EFX_TXQ_LIMIT(etp->et_mask + 1)) {
+       if (added - completed + ndescs > EFX_TXQ_LIMIT(etp->et_mask + 1)) {
                rc = ENOSPC;
                goto fail1;
        }
 
-       for (i = 0; i < n; i++) {
+       for (i = 0; i < ndescs; i++) {
                efx_desc_t *edp = &ed[i];
                unsigned int id;
                size_t offset;
@@ -998,7 +998,7 @@ siena_tx_qdesc_post(
        }
 
        EFSYS_PROBE3(tx_desc_post, unsigned int, etp->et_index,
-                   unsigned int, added, unsigned int, n);
+                   unsigned int, added, unsigned int, ndescs);
 
        EFX_TX_QSTAT_INCR(etp, TX_POST);