git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus/pci: change IOVA as VA flag name
[dpdk.git]
/
drivers
/
net
/
sfc
/
base
/
ef10_tx.c
diff --git
a/drivers/net/sfc/base/ef10_tx.c
b/drivers/net/sfc/base/ef10_tx.c
index
e74d395
..
90f4803
100644
(file)
--- a/
drivers/net/sfc/base/ef10_tx.c
+++ b/
drivers/net/sfc/base/ef10_tx.c
@@
-8,7
+8,7
@@
#include "efx_impl.h"
#include "efx_impl.h"
-#if EF
SYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2
+#if EF
X_OPTS_EF10()
#if EFSYS_OPT_QSTATS
#define EFX_TX_QSTAT_INCR(_etp, _stat) \
#if EFSYS_OPT_QSTATS
#define EFX_TX_QSTAT_INCR(_etp, _stat) \
@@
-31,29
+31,30
@@
efx_mcdi_init_txq(
__in efsys_mem_t *esmp)
{
efx_mcdi_req_t req;
__in efsys_mem_t *esmp)
{
efx_mcdi_req_t req;
- uint8_t payload[MAX(MC_CMD_INIT_TXQ_IN_LEN(EFX_TXQ_MAX_BUFS),
- MC_CMD_INIT_TXQ_OUT_LEN)];
+ EFX_MCDI_DECLARE_BUF(payload,
+ MC_CMD_INIT_TXQ_IN_LEN(EF10_TXQ_MAXNBUFS),
+ MC_CMD_INIT_TXQ_OUT_LEN);
efx_qword_t *dma_addr;
uint64_t addr;
int npages;
int i;
efx_rc_t rc;
efx_qword_t *dma_addr;
uint64_t addr;
int npages;
int i;
efx_rc_t rc;
- EFSYS_ASSERT(EF
X_TXQ_MAX_
BUFS >=
-
EFX_TXQ_NBUFS(
enp->en_nic_cfg.enc_txq_max_ndescs));
+ EFSYS_ASSERT(EF
10_TXQ_MAXN
BUFS >=
+
efx_txq_nbufs(enp,
enp->en_nic_cfg.enc_txq_max_ndescs));
- if ((esmp == NULL) || (EFSYS_MEM_SIZE(esmp) < EFX_TXQ_SIZE(ndescs))) {
+ if ((esmp == NULL) ||
+ (EFSYS_MEM_SIZE(esmp) < efx_txq_size(enp, ndescs))) {
rc = EINVAL;
goto fail1;
}
rc = EINVAL;
goto fail1;
}
- npages =
EFX_TXQ_NBUFS(
ndescs);
+ npages =
efx_txq_nbufs(enp,
ndescs);
if (MC_CMD_INIT_TXQ_IN_LEN(npages) > sizeof (payload)) {
rc = EINVAL;
goto fail2;
}
if (MC_CMD_INIT_TXQ_IN_LEN(npages) > sizeof (payload)) {
rc = EINVAL;
goto fail2;
}
- (void) memset(payload, 0, sizeof (payload));
req.emr_cmd = MC_CMD_INIT_TXQ;
req.emr_in_buf = payload;
req.emr_in_length = MC_CMD_INIT_TXQ_IN_LEN(npages);
req.emr_cmd = MC_CMD_INIT_TXQ;
req.emr_in_buf = payload;
req.emr_in_length = MC_CMD_INIT_TXQ_IN_LEN(npages);
@@
-81,7
+82,7
@@
efx_mcdi_init_txq(
INIT_TXQ_IN_FLAG_TIMESTAMP, 0);
MCDI_IN_SET_DWORD(req, INIT_TXQ_IN_OWNER_ID, 0);
INIT_TXQ_IN_FLAG_TIMESTAMP, 0);
MCDI_IN_SET_DWORD(req, INIT_TXQ_IN_OWNER_ID, 0);
- MCDI_IN_SET_DWORD(req, INIT_TXQ_IN_PORT_ID,
EVB_PORT_ID_ASSIGNED
);
+ MCDI_IN_SET_DWORD(req, INIT_TXQ_IN_PORT_ID,
enp->en_vport_id
);
dma_addr = MCDI_IN2(req, efx_qword_t, INIT_TXQ_IN_DMA_ADDR);
addr = EFSYS_MEM_ADDR(esmp);
dma_addr = MCDI_IN2(req, efx_qword_t, INIT_TXQ_IN_DMA_ADDR);
addr = EFSYS_MEM_ADDR(esmp);
@@
-120,11
+121,10
@@
efx_mcdi_fini_txq(
__in uint32_t instance)
{
efx_mcdi_req_t req;
__in uint32_t instance)
{
efx_mcdi_req_t req;
-
uint8_t payload[MAX(
MC_CMD_FINI_TXQ_IN_LEN,
-
MC_CMD_FINI_TXQ_OUT_LEN)]
;
+
EFX_MCDI_DECLARE_BUF(payload,
MC_CMD_FINI_TXQ_IN_LEN,
+
MC_CMD_FINI_TXQ_OUT_LEN)
;
efx_rc_t rc;
efx_rc_t rc;
- (void) memset(payload, 0, sizeof (payload));
req.emr_cmd = MC_CMD_FINI_TXQ;
req.emr_in_buf = payload;
req.emr_in_length = MC_CMD_FINI_TXQ_IN_LEN;
req.emr_cmd = MC_CMD_FINI_TXQ;
req.emr_in_buf = payload;
req.emr_in_length = MC_CMD_FINI_TXQ_IN_LEN;
@@
-541,12
+541,9
@@
ef10_tx_qdesc_post(
{
unsigned int added = *addedp;
unsigned int i;
{
unsigned int added = *addedp;
unsigned int i;
- efx_rc_t rc;
- if (added - completed + ndescs > EFX_TXQ_LIMIT(etp->et_mask + 1)) {
- rc = ENOSPC;
- goto fail1;
- }
+ if (added - completed + ndescs > EFX_TXQ_LIMIT(etp->et_mask + 1))
+ return (ENOSPC);
for (i = 0; i < ndescs; i++) {
efx_desc_t *edp = &ed[i];
for (i = 0; i < ndescs; i++) {
efx_desc_t *edp = &ed[i];
@@
-566,11
+563,6
@@
ef10_tx_qdesc_post(
*addedp = added;
return (0);
*addedp = added;
return (0);
-
-fail1:
- EFSYS_PROBE1(fail1, efx_rc_t, rc);
-
- return (rc);
}
void
}
void
@@
-777,4
+769,4
@@
ef10_tx_qstats_update(
#endif /* EFSYS_OPT_QSTATS */
#endif /* EFSYS_OPT_QSTATS */
-#endif /* EF
SYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2
*/
+#endif /* EF
X_OPTS_EF10()
*/