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_mcdi.c
diff --git
a/drivers/net/sfc/base/ef10_mcdi.c
b/drivers/net/sfc/base/ef10_mcdi.c
index
b533033
..
9e8a0c1
100644
(file)
--- a/
drivers/net/sfc/base/ef10_mcdi.c
+++ b/
drivers/net/sfc/base/ef10_mcdi.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_MCDI
#if EFSYS_OPT_MCDI
@@
-27,9
+27,7
@@
ef10_mcdi_init(
efx_dword_t dword;
efx_rc_t rc;
efx_dword_t dword;
efx_rc_t rc;
- EFSYS_ASSERT(enp->en_family == EFX_FAMILY_HUNTINGTON ||
- enp->en_family == EFX_FAMILY_MEDFORD ||
- enp->en_family == EFX_FAMILY_MEDFORD2);
+ EFSYS_ASSERT(EFX_FAMILY_IS_EF10(enp));
EFSYS_ASSERT(enp->en_features & EFX_FEATURE_MCDI_DMA);
/*
EFSYS_ASSERT(enp->en_features & EFX_FEATURE_MCDI_DMA);
/*
@@
-135,9
+133,7
@@
ef10_mcdi_send_request(
efx_dword_t dword;
unsigned int pos;
efx_dword_t dword;
unsigned int pos;
- EFSYS_ASSERT(enp->en_family == EFX_FAMILY_HUNTINGTON ||
- enp->en_family == EFX_FAMILY_MEDFORD ||
- enp->en_family == EFX_FAMILY_MEDFORD2);
+ EFSYS_ASSERT(EFX_FAMILY_IS_EF10(enp));
/* Write the header */
for (pos = 0; pos < hdr_len; pos += sizeof (efx_dword_t)) {
/* Write the header */
for (pos = 0; pos < hdr_len; pos += sizeof (efx_dword_t)) {
@@
-188,13
+184,17
@@
ef10_mcdi_read_response(
{
const efx_mcdi_transport_t *emtp = enp->en_mcdi.em_emtp;
efsys_mem_t *esmp = emtp->emt_dma_mem;
{
const efx_mcdi_transport_t *emtp = enp->en_mcdi.em_emtp;
efsys_mem_t *esmp = emtp->emt_dma_mem;
- unsigned int pos;
+ unsigned int pos
= 0
;
efx_dword_t data;
efx_dword_t data;
+ size_t remaining = length;
+
+ while (remaining > 0) {
+ size_t chunk = MIN(remaining, sizeof (data));
- for (pos = 0; pos < length; pos += sizeof (efx_dword_t)) {
EFSYS_MEM_READD(esmp, offset + pos, &data);
EFSYS_MEM_READD(esmp, offset + pos, &data);
- memcpy((uint8_t *)bufferp + pos, &data,
- MIN(sizeof (data), length - pos));
+ memcpy((uint8_t *)bufferp + pos, &data, chunk);
+ pos += chunk;
+ remaining -= chunk;
}
}
}
}
@@
-255,9
+255,7
@@
ef10_mcdi_feature_supported(
uint32_t privilege_mask = encp->enc_privilege_mask;
efx_rc_t rc;
uint32_t privilege_mask = encp->enc_privilege_mask;
efx_rc_t rc;
- EFSYS_ASSERT(enp->en_family == EFX_FAMILY_HUNTINGTON ||
- enp->en_family == EFX_FAMILY_MEDFORD ||
- enp->en_family == EFX_FAMILY_MEDFORD2);
+ EFSYS_ASSERT(EFX_FAMILY_IS_EF10(enp));
/*
* Use privilege mask state at MCDI attach.
/*
* Use privilege mask state at MCDI attach.
@@
-318,4
+316,4
@@
fail1:
#endif /* EFSYS_OPT_MCDI */
#endif /* EFSYS_OPT_MCDI */
-#endif /* EF
SYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2
*/
+#endif /* EF
X_OPTS_EF10()
*/