d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sfxge(4): improve names for TXQ descriptor counts

Browse Source 
Submitted by:   Andy Moreton <amoreton at solarflare.com>
Sponsored by:   Solarflare Communications, Inc.
Differential Revision:  https://reviews.freebsd.org/D18109
This commit is contained in:
arybchik 2018-11-24 15:23:34 +00:00
parent af050e908f
commit fcffe03c2c
4 changed files with 87 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/sfxge/common/ef10_impl.h
View File

@ -670,7 +670,7 @@ ef10_tx_qcreate(
__in unsigned int index, __in unsigned int index,
__in unsigned int label, __in unsigned int label,
__in efsys_mem_t *esmp, __in efsys_mem_t *esmp,
__in size_t n, __in size_t ndescs,
__in uint32_t id, __in uint32_t id,
__in uint16_t flags, __in uint16_t flags,
__in efx_evq_t *eep, __in efx_evq_t *eep,
@ -684,8 +684,8 @@ ef10_tx_qdestroy(
extern __checkReturn efx_rc_t extern __checkReturn efx_rc_t
ef10_tx_qpost( ef10_tx_qpost(
__in efx_txq_t *etp, __in efx_txq_t *etp,
__in_ecount(n) efx_buffer_t *eb, __in_ecount(ndescs) efx_buffer_t *ebp,
__in unsigned int n, __in unsigned int ndescs,
__in unsigned int completed, __in unsigned int completed,
__inout unsigned int *addedp); __inout unsigned int *addedp);

30
sys/dev/sfxge/common/ef10_tx.c
View File

@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
static __checkReturn efx_rc_t static __checkReturn efx_rc_t
efx_mcdi_init_txq( efx_mcdi_init_txq(
__in efx_nic_t *enp, __in efx_nic_t *enp,
__in uint32_t size, __in uint32_t ndescs,
__in uint32_t target_evq, __in uint32_t target_evq,
__in uint32_t label, __in uint32_t label,
__in uint32_t instance, __in uint32_t instance,
@ -69,7 +69,7 @@ efx_mcdi_init_txq(
EFSYS_ASSERT(EFX_TXQ_MAX_BUFS >= EFSYS_ASSERT(EFX_TXQ_MAX_BUFS >=
EFX_TXQ_NBUFS(enp->en_nic_cfg.enc_txq_max_ndescs)); 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)) { if (MC_CMD_INIT_TXQ_IN_LEN(npages) > sizeof (payload)) {
rc = EINVAL; rc = EINVAL;
goto fail1; goto fail1;
@ -82,7 +82,7 @@ efx_mcdi_init_txq(
req.emr_out_buf = payload; req.emr_out_buf = payload;
req.emr_out_length = MC_CMD_INIT_TXQ_OUT_LEN; 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_TARGET_EVQ, target_evq);
MCDI_IN_SET_DWORD(req, INIT_TXQ_IN_LABEL, label); MCDI_IN_SET_DWORD(req, INIT_TXQ_IN_LABEL, label);
MCDI_IN_SET_DWORD(req, INIT_TXQ_IN_INSTANCE, instance); MCDI_IN_SET_DWORD(req, INIT_TXQ_IN_INSTANCE, instance);
@ -194,7 +194,7 @@ ef10_tx_qcreate(
__in unsigned int index, __in unsigned int index,
__in unsigned int label, __in unsigned int label,
__in efsys_mem_t *esmp, __in efsys_mem_t *esmp,
__in size_t n, __in size_t ndescs,
__in uint32_t id, __in uint32_t id,
__in uint16_t flags, __in uint16_t flags,
__in efx_evq_t *eep, __in efx_evq_t *eep,
@ -215,8 +215,8 @@ ef10_tx_qcreate(
goto fail1; goto fail1;
} }
if ((rc = efx_mcdi_init_txq(enp, n, eep->ee_index, label, index, flags, if ((rc = efx_mcdi_init_txq(enp, ndescs, eep->ee_index, label, index,
esmp)) != 0) flags, esmp)) != 0)
goto fail2; goto fail2;
/* /*
@ -439,8 +439,8 @@ fail1:
__checkReturn efx_rc_t __checkReturn efx_rc_t
ef10_tx_qpost( ef10_tx_qpost(
__in efx_txq_t *etp, __in efx_txq_t *etp,
__in_ecount(n) efx_buffer_t *eb, __in_ecount(ndescs) efx_buffer_t *eb,
__in unsigned int n, __in unsigned int ndescs,
__in unsigned int completed, __in unsigned int completed,
__inout unsigned int *addedp) __inout unsigned int *addedp)
{ {
@ -448,12 +448,12 @@ ef10_tx_qpost(
unsigned int i; unsigned int i;
efx_rc_t rc; 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; rc = ENOSPC;
goto fail1; goto fail1;
} }
for (i = 0; i < n; i++) { for (i = 0; i < ndescs; i++) {
efx_buffer_t *ebp = &eb[i]; efx_buffer_t *ebp = &eb[i];
efsys_dma_addr_t addr = ebp->eb_addr; efsys_dma_addr_t addr = ebp->eb_addr;
size_t size = ebp->eb_size; size_t size = ebp->eb_size;
@ -562,8 +562,8 @@ ef10_tx_qpush(
__checkReturn efx_rc_t __checkReturn efx_rc_t
ef10_tx_qdesc_post( ef10_tx_qdesc_post(
__in efx_txq_t *etp, __in efx_txq_t *etp,
__in_ecount(n) efx_desc_t *ed, __in_ecount(ndescs) efx_desc_t *ed,
__in unsigned int n, __in unsigned int ndescs,
__in unsigned int completed, __in unsigned int completed,
__inout unsigned int *addedp) __inout unsigned int *addedp)
{ {
@ -571,12 +571,12 @@ ef10_tx_qdesc_post(
unsigned int i; unsigned int i;
efx_rc_t rc; 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; rc = ENOSPC;
goto fail1; goto fail1;
} }
for (i = 0; i < n; i++) { for (i = 0; i < ndescs; i++) {
efx_desc_t *edp = &ed[i]; efx_desc_t *edp = &ed[i];
unsigned int id; unsigned int id;
size_t offset; size_t offset;
@ -588,7 +588,7 @@ ef10_tx_qdesc_post(
} }
EFSYS_PROBE3(tx_desc_post, unsigned int, etp->et_index, 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); EFX_TX_QSTAT_INCR(etp, TX_POST);

4
sys/dev/sfxge/common/efx.h
View File

@ -2133,8 +2133,8 @@ efx_tx_qcreate(
extern __checkReturn efx_rc_t extern __checkReturn efx_rc_t
efx_tx_qpost( efx_tx_qpost(
__in efx_txq_t *etp, __in efx_txq_t *etp,
__in_ecount(n) efx_buffer_t *eb, __in_ecount(ndescs) efx_buffer_t *eb,
__in unsigned int n, __in unsigned int ndescs,
__in unsigned int completed, __in unsigned int completed,
__inout unsigned int *addedp); __inout unsigned int *addedp);

54
sys/dev/sfxge/common/efx_tx.c
View File

@ -62,7 +62,7 @@ siena_tx_qcreate(
__in unsigned int index, __in unsigned int index,
__in unsigned int label, __in unsigned int label,
__in efsys_mem_t *esmp, __in efsys_mem_t *esmp,
__in size_t n, __in size_t ndescs,
__in uint32_t id, __in uint32_t id,
__in uint16_t flags, __in uint16_t flags,
__in efx_evq_t *eep, __in efx_evq_t *eep,
@ -76,8 +76,8 @@ siena_tx_qdestroy(
static __checkReturn efx_rc_t static __checkReturn efx_rc_t
siena_tx_qpost( siena_tx_qpost(
__in efx_txq_t *etp, __in efx_txq_t *etp,
__in_ecount(n) efx_buffer_t *eb, __in_ecount(ndescs) efx_buffer_t *eb,
__in unsigned int n, __in unsigned int ndescs,
__in unsigned int completed, __in unsigned int completed,
__inout unsigned int *addedp); __inout unsigned int *addedp);
@ -103,8 +103,8 @@ siena_tx_qenable(
__checkReturn efx_rc_t __checkReturn efx_rc_t
siena_tx_qdesc_post( siena_tx_qdesc_post(
__in efx_txq_t *etp, __in efx_txq_t *etp,
__in_ecount(n) efx_desc_t *ed, __in_ecount(ndescs) efx_desc_t *ed,
__in unsigned int n, __in unsigned int ndescs,
__in unsigned int completed, __in unsigned int completed,
__inout unsigned int *addedp); __inout unsigned int *addedp);
@ -295,7 +295,7 @@ efx_tx_qcreate(
__in unsigned int index, __in unsigned int index,
__in unsigned int label, __in unsigned int label,
__in efsys_mem_t *esmp, __in efsys_mem_t *esmp,
__in size_t n, __in size_t ndescs,
__in uint32_t id, __in uint32_t id,
__in uint16_t flags, __in uint16_t flags,
__in efx_evq_t *eep, __in efx_evq_t *eep,
@ -323,14 +323,14 @@ efx_tx_qcreate(
etp->et_magic = EFX_TXQ_MAGIC; etp->et_magic = EFX_TXQ_MAGIC;
etp->et_enp = enp; etp->et_enp = enp;
etp->et_index = index; etp->et_index = index;
etp->et_mask = n - 1; etp->et_mask = ndescs - 1;
etp->et_esmp = esmp; etp->et_esmp = esmp;
/* Initial descriptor index may be modified by etxo_qcreate */ /* Initial descriptor index may be modified by etxo_qcreate */
*addedp = 0; *addedp = 0;
if ((rc = etxop->etxo_qcreate(enp, index, label, esmp, 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; goto fail2;
enp->en_tx_qcount++; enp->en_tx_qcount++;
@ -367,8 +367,8 @@ efx_tx_qdestroy(
__checkReturn efx_rc_t __checkReturn efx_rc_t
efx_tx_qpost( efx_tx_qpost(
__in efx_txq_t *etp, __in efx_txq_t *etp,
__in_ecount(n) efx_buffer_t *eb, __in_ecount(ndescs) efx_buffer_t *eb,
__in unsigned int n, __in unsigned int ndescs,
__in unsigned int completed, __in unsigned int completed,
__inout unsigned int *addedp) __inout unsigned int *addedp)
{ {
@ -378,8 +378,7 @@ efx_tx_qpost(
EFSYS_ASSERT3U(etp->et_magic, ==, EFX_TXQ_MAGIC); EFSYS_ASSERT3U(etp->et_magic, ==, EFX_TXQ_MAGIC);
if ((rc = etxop->etxo_qpost(etp, eb, if ((rc = etxop->etxo_qpost(etp, eb, ndescs, completed, addedp)) != 0)
n, completed, addedp)) != 0)
goto fail1; goto fail1;
return (0); return (0);
@ -558,8 +557,8 @@ fail1:
__checkReturn efx_rc_t __checkReturn efx_rc_t
efx_tx_qdesc_post( efx_tx_qdesc_post(
__in efx_txq_t *etp, __in efx_txq_t *etp,
__in_ecount(n) efx_desc_t *ed, __in_ecount(ndescs) efx_desc_t *ed,
__in unsigned int n, __in unsigned int ndescs,
__in unsigned int completed, __in unsigned int completed,
__inout unsigned int *addedp) __inout unsigned int *addedp)
{ {
@ -570,7 +569,7 @@ efx_tx_qdesc_post(
EFSYS_ASSERT3U(etp->et_magic, ==, EFX_TXQ_MAGIC); EFSYS_ASSERT3U(etp->et_magic, ==, EFX_TXQ_MAGIC);
if ((rc = etxop->etxo_qdesc_post(etp, ed, if ((rc = etxop->etxo_qdesc_post(etp, ed,
n, completed, addedp)) != 0) ndescs, completed, addedp)) != 0)
goto fail1; goto fail1;
return (0); return (0);
@ -732,8 +731,8 @@ siena_tx_init(
static __checkReturn efx_rc_t static __checkReturn efx_rc_t
siena_tx_qpost( siena_tx_qpost(
__in efx_txq_t *etp, __in efx_txq_t *etp,
__in_ecount(n) efx_buffer_t *eb, __in_ecount(ndescs) efx_buffer_t *eb,
__in unsigned int n, __in unsigned int ndescs,
__in unsigned int completed, __in unsigned int completed,
__inout unsigned int *addedp) __inout unsigned int *addedp)
{ {
@ -741,10 +740,10 @@ siena_tx_qpost(
unsigned int i; unsigned int i;
int rc = ENOSPC; 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; goto fail1;
for (i = 0; i < n; i++) { for (i = 0; i < ndescs; i++) {
efx_buffer_t *ebp = &eb[i]; efx_buffer_t *ebp = &eb[i];
efsys_dma_addr_t start = ebp->eb_addr; efsys_dma_addr_t start = ebp->eb_addr;
size_t size = ebp->eb_size; size_t size = ebp->eb_size;
@ -895,7 +894,7 @@ siena_tx_qcreate(
__in unsigned int index, __in unsigned int index,
__in unsigned int label, __in unsigned int label,
__in efsys_mem_t *esmp, __in efsys_mem_t *esmp,
__in size_t n, __in size_t ndescs,
__in uint32_t id, __in uint32_t id,
__in uint16_t flags, __in uint16_t flags,
__in efx_evq_t *eep, __in efx_evq_t *eep,
@ -917,7 +916,8 @@ siena_tx_qcreate(
EFSYS_ASSERT(ISP2(encp->enc_txq_max_ndescs)); EFSYS_ASSERT(ISP2(encp->enc_txq_max_ndescs));
EFX_STATIC_ASSERT(ISP2(EFX_TXQ_MINNDESCS)); 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; rc = EINVAL;
goto fail1; goto fail1;
} }
@ -928,7 +928,7 @@ siena_tx_qcreate(
for (size = 0; for (size = 0;
(1 << size) <= (int)(encp->enc_txq_max_ndescs / EFX_TXQ_MINNDESCS); (1 << size) <= (int)(encp->enc_txq_max_ndescs / EFX_TXQ_MINNDESCS);
size++) size++)
if ((1 << size) == (int)(n / EFX_TXQ_MINNDESCS)) if ((1 << size) == (int)(ndescs / EFX_TXQ_MINNDESCS))
break; break;
if (id + (1 << size) >= encp->enc_buftbl_limit) { if (id + (1 << size) >= encp->enc_buftbl_limit) {
rc = EINVAL; rc = EINVAL;
@ -978,8 +978,8 @@ fail1:
__checkReturn efx_rc_t __checkReturn efx_rc_t
siena_tx_qdesc_post( siena_tx_qdesc_post(
__in efx_txq_t *etp, __in efx_txq_t *etp,
__in_ecount(n) efx_desc_t *ed, __in_ecount(ndescs) efx_desc_t *ed,
__in unsigned int n, __in unsigned int ndescs,
__in unsigned int completed, __in unsigned int completed,
__inout unsigned int *addedp) __inout unsigned int *addedp)
{ {
@ -987,12 +987,12 @@ siena_tx_qdesc_post(
unsigned int i; unsigned int i;
efx_rc_t rc; 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; rc = ENOSPC;
goto fail1; goto fail1;
} }
for (i = 0; i < n; i++) { for (i = 0; i < ndescs; i++) {
efx_desc_t *edp = &ed[i]; efx_desc_t *edp = &ed[i];
unsigned int id; unsigned int id;
size_t offset; size_t offset;
@ -1004,7 +1004,7 @@ siena_tx_qdesc_post(
} }
EFSYS_PROBE3(tx_desc_post, unsigned int, etp->et_index, 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); EFX_TX_QSTAT_INCR(etp, TX_POST);