Supply Medford4-specific methods to clear, upload and update
MAC statistics, as well as the method to toggle periodic DMA
updates. All of these leverage the same netport MCDI command.
Signed-off-by: Ivan Malov <ivan.ma...@arknetworks.am>
Reviewed-by: Andy Moreton <andy.more...@amd.com>
Reviewed-by: Pieter Jansen Van Vuuren <pieter.jansen-van-vuu...@amd.com>
---
drivers/common/sfc_efx/base/efx_impl.h | 11 ++
drivers/common/sfc_efx/base/efx_mac.c | 6 +-
drivers/common/sfc_efx/base/efx_mcdi.c | 12 +-
drivers/common/sfc_efx/base/efx_np.c | 88 +++++++++++++++
drivers/common/sfc_efx/base/medford4_impl.h | 22 ++++
drivers/common/sfc_efx/base/medford4_mac.c | 119 ++++++++++++++++++++
6 files changed, 253 insertions(+), 5 deletions(-)
diff --git a/drivers/common/sfc_efx/base/efx_impl.h
b/drivers/common/sfc_efx/base/efx_impl.h
index aafb2bf998..7dbad601ff 100644
--- a/drivers/common/sfc_efx/base/efx_impl.h
+++ b/drivers/common/sfc_efx/base/efx_impl.h
@@ -1968,6 +1968,17 @@ efx_np_mac_ctrl(
__in efx_np_handle_t nph,
__in const efx_np_mac_ctrl_t *mc);
+#if EFSYS_OPT_MAC_STATS
+LIBEFX_INTERNAL
+extern __checkReturn efx_rc_t
+efx_np_mac_stats(
+ __in efx_nic_t *enp,
+ __in efx_np_handle_t nph,
+ __in efx_stats_action_t action,
+ __in_opt const efsys_mem_t *esmp,
+ __in uint16_t period_ms);
+#endif /* EFSYS_OPT_MAC_STATS */
+
#ifdef __cplusplus
}
#endif
diff --git a/drivers/common/sfc_efx/base/efx_mac.c
b/drivers/common/sfc_efx/base/efx_mac.c
index 6abe2046e8..92585517c0 100644
--- a/drivers/common/sfc_efx/base/efx_mac.c
+++ b/drivers/common/sfc_efx/base/efx_mac.c
@@ -107,9 +107,9 @@ static const efx_mac_ops_t __efx_mac_medford4_ops = {
#if EFSYS_OPT_MAC_STATS
medford4_mac_stats_get_mask, /* emo_stats_get_mask */
efx_mcdi_mac_stats_clear, /* emo_stats_clear */
- efx_mcdi_mac_stats_upload, /* emo_stats_upload */
- efx_mcdi_mac_stats_periodic, /* emo_stats_periodic */
- ef10_mac_stats_update /* emo_stats_update */
+ medford4_mac_stats_upload, /* emo_stats_upload */
+ medford4_mac_stats_periodic, /* emo_stats_periodic */
+ medford4_mac_stats_update /* emo_stats_update */
#endif /* EFSYS_OPT_MAC_STATS */
};
#endif /* EFSYS_OPT_MEDFORD4 */
diff --git a/drivers/common/sfc_efx/base/efx_mcdi.c
b/drivers/common/sfc_efx/base/efx_mcdi.c
index 0bd56dd84d..20051c7da9 100644
--- a/drivers/common/sfc_efx/base/efx_mcdi.c
+++ b/drivers/common/sfc_efx/base/efx_mcdi.c
@@ -2244,10 +2244,18 @@ efx_mcdi_mac_stats(
efx_mcdi_mac_stats_clear(
__in efx_nic_t *enp)
{
+ efx_port_t *epp = &(enp->en_port);
efx_rc_t rc;
- if ((rc = efx_mcdi_mac_stats(enp, enp->en_vport_id, NULL,
- EFX_STATS_CLEAR, 0)) != 0)
+ if (efx_np_supported(enp) != B_FALSE) {
+ rc = efx_np_mac_stats(enp, epp->ep_np_handle,
+ EFX_STATS_CLEAR, NULL, 0);
+ } else {
+ rc = efx_mcdi_mac_stats(enp, enp->en_vport_id, NULL,
+ EFX_STATS_CLEAR, 0);
+ }
+
+ if (rc != 0)
goto fail1;
return (0);
diff --git a/drivers/common/sfc_efx/base/efx_np.c
b/drivers/common/sfc_efx/base/efx_np.c
index b2a1d56f9d..d54174332e 100644
--- a/drivers/common/sfc_efx/base/efx_np.c
+++ b/drivers/common/sfc_efx/base/efx_np.c
@@ -1259,3 +1259,91 @@ efx_np_mac_ctrl(
EFSYS_PROBE1(fail1, efx_rc_t, rc);
return (rc);
}
+
+#if EFSYS_OPT_MAC_STATS
+ __checkReturn efx_rc_t
+efx_np_mac_stats(
+ __in efx_nic_t *enp,
+ __in efx_np_handle_t nph,
+ __in efx_stats_action_t action,
+ __in_opt const efsys_mem_t *esmp,
+ __in uint16_t period_ms)
+{
+ EFX_MCDI_DECLARE_BUF(payload,
+ MC_CMD_GET_NETPORT_STATISTICS_IN_LEN,
+ MC_CMD_GET_NETPORT_STATISTICS_OUT_LENMIN);
+ boolean_t enable = (action == EFX_STATS_ENABLE_NOEVENTS);
+ boolean_t events = (action == EFX_STATS_ENABLE_EVENTS);
+ boolean_t disable = (action == EFX_STATS_DISABLE);
+ boolean_t upload = (action == EFX_STATS_UPLOAD);
+ boolean_t clear = (action == EFX_STATS_CLEAR);
+ efx_mcdi_req_t req;
+ efx_rc_t rc;
+
+ req.emr_out_length = MC_CMD_GET_NETPORT_STATISTICS_OUT_LENMIN;
+ req.emr_in_length = MC_CMD_GET_NETPORT_STATISTICS_IN_LEN;
+ req.emr_cmd = MC_CMD_GET_NETPORT_STATISTICS;
+ req.emr_out_buf = payload;
+ req.emr_in_buf = payload;
+
+ MCDI_IN_SET_DWORD(req, GET_NETPORT_STATISTICS_IN_PORT_HANDLE, nph);
+
+ MCDI_IN_POPULATE_DWORD_6(req, GET_NETPORT_STATISTICS_IN_CMD,
+ GET_NETPORT_STATISTICS_IN_DMA, upload,
+ GET_NETPORT_STATISTICS_IN_CLEAR, clear,
+ GET_NETPORT_STATISTICS_IN_PERIODIC_CHANGE,
+ enable | events | disable,
+ GET_NETPORT_STATISTICS_IN_PERIODIC_ENABLE, enable | events,
+ GET_NETPORT_STATISTICS_IN_PERIODIC_NOEVENT, !events,
+ GET_NETPORT_STATISTICS_IN_PERIOD_MS,
+ (enable | events) ? period_ms : 0);
+
+ if (enable || events || upload) {
+ const efx_nic_cfg_t *encp = &enp->en_nic_cfg;
+ uint32_t sz;
+
+ /* Periodic stats or stats upload require a DMA buffer */
+ if (esmp == NULL) {
+ rc = EINVAL;
+ goto fail1;
+ }
+
+ sz = encp->enc_mac_stats_nstats * sizeof (efx_qword_t);
+
+ if (EFSYS_MEM_SIZE(esmp) < sz) {
+ /* DMA buffer too small */
+ rc = ENOSPC;
+ goto fail2;
+ }
+
+ MCDI_IN_SET_DWORD(req, GET_NETPORT_STATISTICS_IN_DMA_ADDR_LO,
+ EFSYS_MEM_ADDR(esmp) & 0xffffffff);
+ MCDI_IN_SET_DWORD(req, GET_NETPORT_STATISTICS_IN_DMA_ADDR_HI,
+ EFSYS_MEM_ADDR(esmp) >> 32);
+ MCDI_IN_SET_DWORD(req, GET_NETPORT_STATISTICS_IN_DMA_LEN, sz);
+ }
+
+ efx_mcdi_execute(enp, &req);
+
+ if (req.emr_rc != 0) {
+ /* EF10: Expect ENOENT if no DMA queues are initialised */
+ if ((req.emr_rc != ENOENT) ||
+ (enp->en_rx_qcount + enp->en_tx_qcount != 0)) {
+ rc = req.emr_rc;
+ goto fail3;
+ }
+ }
+
+ return (0);
+
+fail3:
+ EFSYS_PROBE(fail3);
+
+fail2:
+ EFSYS_PROBE(fail2);
+
+fail1:
+ EFSYS_PROBE1(fail1, efx_rc_t, rc);
+ return (rc);
+}
+#endif /* EFSYS_OPT_MAC_STATS */
diff --git a/drivers/common/sfc_efx/base/medford4_impl.h
b/drivers/common/sfc_efx/base/medford4_impl.h
index 2fbf1495d1..94d076db95 100644
--- a/drivers/common/sfc_efx/base/medford4_impl.h
+++ b/drivers/common/sfc_efx/base/medford4_impl.h
@@ -63,6 +63,28 @@ medford4_mac_stats_get_mask(
__in efx_nic_t *enp,
__inout_bcount(sz) uint32_t *maskp,
__in size_t sz);
+
+LIBEFX_INTERNAL
+extern __checkReturn efx_rc_t
+medford4_mac_stats_upload(
+ __in efx_nic_t *enp,
+ __in efsys_mem_t *esmp);
+
+LIBEFX_INTERNAL
+extern __checkReturn efx_rc_t
+medford4_mac_stats_periodic(
+ __in efx_nic_t *enp,
+ __in efsys_mem_t *esmp,
+ __in uint16_t period_ms,
+ __in boolean_t events);
+
+LIBEFX_INTERNAL
+extern __checkReturn efx_rc_t
+medford4_mac_stats_update(
+ __in efx_nic_t *enp,
+ __in efsys_mem_t *esmp,
+ __inout_ecount(EFX_MAC_NSTATS) efsys_stat_t *stats,
+ __inout_opt uint32_t *generationp);
#endif /* EFSYS_OPT_MAC_STATS */
#ifdef __cplusplus
diff --git a/drivers/common/sfc_efx/base/medford4_mac.c
b/drivers/common/sfc_efx/base/medford4_mac.c
index 23c59f18ed..3e2493e824 100644
--- a/drivers/common/sfc_efx/base/medford4_mac.c
+++ b/drivers/common/sfc_efx/base/medford4_mac.c
@@ -119,5 +119,124 @@ medford4_mac_stats_get_mask(
EFSYS_PROBE1(fail1, efx_rc_t, rc);
return (rc);
}
+
+ __checkReturn efx_rc_t
+medford4_mac_stats_upload(
+ __in efx_nic_t *enp,
+ __in efsys_mem_t *esmp)
+{
+ efx_port_t *epp = &(enp->en_port);
+ efx_rc_t rc;
+
+ rc = efx_np_mac_stats(enp,
+ epp->ep_np_handle, EFX_STATS_UPLOAD, esmp, 0);
+ if (rc != 0)
+ goto fail1;
+
+ return (0);
+
+fail1:
+ EFSYS_PROBE1(fail1, efx_rc_t, rc);
+ return (rc);
+}
+
+ __checkReturn efx_rc_t
+medford4_mac_stats_periodic(
+ __in efx_nic_t *enp,
+ __in efsys_mem_t *esmp,
+ __in uint16_t period_ms,
+ __in boolean_t events)
+{
+ efx_port_t *epp = &(enp->en_port);
+ efx_rc_t rc;
+
+ if (period_ms == 0) {
+ rc = efx_np_mac_stats(enp, epp->ep_np_handle,
+ EFX_STATS_DISABLE, NULL, 0);
+ } else if (events != B_FALSE) {
+ rc = efx_np_mac_stats(enp, epp->ep_np_handle,
+ EFX_STATS_ENABLE_EVENTS, esmp, period_ms);
+ } else {
+ rc = efx_np_mac_stats(enp, epp->ep_np_handle,
+ EFX_STATS_ENABLE_NOEVENTS, esmp, period_ms);
+ }
+
+ if (rc != 0)
+ goto fail1;
+
+ return (0);
+
+fail1:
+ EFSYS_PROBE1(fail1, efx_rc_t, rc);
+ return (rc);
+}
+
+#define MEDFORD4_MAC_STAT_READ(_esmp, _field, _eqp)
\
+ EFSYS_MEM_READQ((_esmp), (_field) * sizeof (efx_qword_t), _eqp)
+
+ __checkReturn efx_rc_t
+medford4_mac_stats_update(
+ __in efx_nic_t *enp,
+ __in efsys_mem_t *esmp,
+ __inout_ecount(EFX_MAC_NSTATS) efsys_stat_t *stats,
+ __inout_opt uint32_t *generationp)
+{
+ const efx_nic_cfg_t *encp = &enp->en_nic_cfg;
+ efx_port_t *epp = &(enp->en_port);
+ efx_qword_t generation_start;
+ efx_qword_t generation_end;
+ unsigned int i;
+ efx_rc_t rc;
+
+ if (EFSYS_MEM_SIZE(esmp) <
+ (encp->enc_mac_stats_nstats * sizeof (efx_qword_t))) {
+ /* DMA buffer too small */
+ rc = ENOSPC;
+ goto fail1;
+ }
+
+ /* Read END first so we don't race with the MC */
+ EFSYS_DMA_SYNC_FOR_KERNEL(esmp, 0, EFSYS_MEM_SIZE(esmp));
+ MEDFORD4_MAC_STAT_READ(esmp, (encp->enc_mac_stats_nstats - 1),
+ &generation_end);
+ EFSYS_MEM_READ_BARRIER();
+
+ for (i = 0; i < EFX_ARRAY_SIZE(epp->ep_np_mac_stat_lut); ++i) {
+ efx_qword_t value;
+
+ if (epp->ep_np_mac_stat_lut[i].ens_valid == B_FALSE)
+ continue;
+
+ MEDFORD4_MAC_STAT_READ(esmp,
+ epp->ep_np_mac_stat_lut[i].ens_dma_fld, &value);
+
+ EFSYS_STAT_SET_QWORD(&(stats[i]), &value);
+ }
+
+ /* TODO: care about VADAPTOR statistics when VF support arrives */
+
+ /* Read START generation counter */
+ EFSYS_DMA_SYNC_FOR_KERNEL(esmp, 0, EFSYS_MEM_SIZE(esmp));
+ EFSYS_MEM_READ_BARRIER();
+
+ /* We never parse marker descriptors; assume start is 0 offset */
+ MEDFORD4_MAC_STAT_READ(esmp, 0, &generation_start);
+
+ /* Check that we didn't read the stats in the middle of a DMA */
+ if (memcmp(&generation_start, &generation_end,
+ sizeof (generation_start)) != 0)
+ return (EAGAIN);
+
+ if (generationp != NULL)
+ *generationp = EFX_QWORD_FIELD(generation_start, EFX_DWORD_0);
+
+ return (0);
+
+fail1:
+ EFSYS_PROBE1(fail1, efx_rc_t, rc);
+ return (rc);
+}
+
+#undef MEDFORD4_MAC_STAT_READ
#endif /* EFSYS_OPT_MAC_STATS */
#endif /* EFSYS_OPT_MEDFORD4 */
--
2.39.5
