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
net/bnxt: add TruFlow core identifier
[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
aacf431
..
e2f9eba
100644
(file)
--- a/
drivers/net/sfc/base/ef10_tx.c
+++ b/
drivers/net/sfc/base/ef10_tx.c
@@
-1,14
+1,14
@@
/* SPDX-License-Identifier: BSD-3-Clause
*
/* SPDX-License-Identifier: BSD-3-Clause
*
- * Copyright
(c) 2012-2018 Solarflare Communications
Inc.
- *
All rights reserved
.
+ * Copyright
(c) 2019-2020 Xilinx,
Inc.
+ *
Copyright(c) 2012-2019 Solarflare Communications Inc
.
*/
#include "efx.h"
#include "efx_impl.h"
*/
#include "efx.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) \
@@
-41,14
+41,15
@@
efx_mcdi_init_txq(
efx_rc_t rc;
EFSYS_ASSERT(EF10_TXQ_MAXNBUFS >=
efx_rc_t rc;
EFSYS_ASSERT(EF10_TXQ_MAXNBUFS >=
-
EFX_TXQ_NBUFS(
enp->en_nic_cfg.enc_txq_max_ndescs));
+
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;
@@
-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);
@@
-768,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()
*/