From: Prashant Gupta <prashant.gupta_3@nxp.com>
To: dev@dpdk.org, stephen@networkplumber.org, david.marchand@redhat.com
Cc: Ioana Ciornei <ioana.ciornei@nxp.com>
Subject: [PATCH 09/15] net/dpaa2: setup the speed cap based on the actual MAC
Date: Tue, 14 Oct 2025 12:10:29 +0530 [thread overview]
Message-ID: <20251014064035.1312896-10-prashant.gupta_3@nxp.com> (raw)
In-Reply-To: <20251014064035.1312896-1-prashant.gupta_3@nxp.com>
From: Ioana Ciornei <ioana.ciornei@nxp.com>
Previously, the speed_capa field from struct rte_eth_dev_info was
populated with all possible speeds that the MACs on the system could
sustain. What this meant is that the bitmap of speed capability did not
reflect what the MAC could do in the current circumstance.
Fix this by using the newly added MC command
dpni_get_mac_speed_capability() which returns a bitmap of
enum dpmac_link_speed. Since the MC API is a newly added one, we check
for the DPNI version to determine is we can use the API, if not the code
will fallback to the procedure used up until now.
Also, we interogate the MC firmware only at probe time to get the needed
into and then we store the information in the private structure to
use it any time .dev_infos_get() is called.
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---
drivers/net/dpaa2/dpaa2_ethdev.c | 87 ++++++++++++++++++++++++++---
drivers/net/dpaa2/dpaa2_ethdev.h | 12 ++++
drivers/net/dpaa2/mc/dpni.c | 21 +++++++
drivers/net/dpaa2/mc/fsl_dpmac.h | 15 +++++
drivers/net/dpaa2/mc/fsl_dpni.h | 5 +-
drivers/net/dpaa2/mc/fsl_dpni_cmd.h | 4 ++
6 files changed, 134 insertions(+), 10 deletions(-)
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index 5c4c0ae462..529856f704 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -290,6 +290,79 @@ dpaa2_fw_version_get(struct rte_eth_dev *dev,
return 0;
}
+static uint32_t dpaa2_speed_to_rte_link_speed(enum dpmac_link_speed dpmac_speed)
+{
+ switch (dpmac_speed) {
+ case DPMAC_LINK_SPEED_10M:
+ return RTE_ETH_LINK_SPEED_10M;
+ case DPMAC_LINK_SPEED_100M:
+ return RTE_ETH_LINK_SPEED_100M;
+ case DPMAC_LINK_SPEED_1G:
+ return RTE_ETH_LINK_SPEED_1G;
+ case DPMAC_LINK_SPEED_2_5G:
+ return RTE_ETH_LINK_SPEED_2_5G;
+ case DPMAC_LINK_SPEED_5G:
+ return RTE_ETH_LINK_SPEED_5G;
+ case DPMAC_LINK_SPEED_10G:
+ return RTE_ETH_LINK_SPEED_10G;
+ case DPMAC_LINK_SPEED_25G:
+ return RTE_ETH_LINK_SPEED_25G;
+ case DPMAC_LINK_SPEED_40G:
+ return RTE_ETH_LINK_SPEED_40G;
+ case DPMAC_LINK_SPEED_50G:
+ return RTE_ETH_LINK_SPEED_50G;
+ case DPMAC_LINK_SPEED_100G:
+ return RTE_ETH_LINK_SPEED_100G;
+ default:
+ return 0;
+ }
+}
+
+static uint32_t dpaa2_dev_get_speed_capability(struct rte_eth_dev *dev)
+{
+ struct fsl_mc_io *dpni = (struct fsl_mc_io *)dev->process_private;
+ struct dpaa2_dev_priv *priv = dev->data->dev_private;
+ enum dpmac_link_speed speed;
+ uint32_t dpmac_speed_cap;
+ uint32_t speed_capa = 0;
+ int ret;
+
+ /* The dpni_get_mac_supported_eth_if() API is only available starting
+ * with DPNI ver 8.6.
+ */
+ if (dpaa2_dev_cmp_dpni_ver(priv, DPNI_GET_MAC_SUPPORTED_IFS_VER_MAJOR,
+ DPNI_GET_MAC_SUPPORTED_IFS_VER_MINOR) < 0)
+ goto fallback;
+
+ if (priv->ep_dev_type != DPAA2_MAC)
+ goto fallback;
+
+ ret = dpni_get_mac_speed_capability(dpni, CMD_PRI_LOW, priv->token,
+ &dpmac_speed_cap);
+ if (ret < 0) {
+ DPAA2_PMD_WARN("dpni_get_mac_speed_capability() failed with %d", ret);
+ goto fallback;
+ }
+ for (speed = DPMAC_LINK_SPEED_10M; speed < DPMAC_LINK_SPEED_MAX; speed++) {
+ if ((dpmac_speed_cap & (1 << speed)) == 0)
+ continue;
+
+ speed_capa |= dpaa2_speed_to_rte_link_speed(speed);
+ }
+
+ return speed_capa;
+
+fallback:
+ speed_capa = RTE_ETH_LINK_SPEED_1G | RTE_ETH_LINK_SPEED_2_5G |
+ RTE_ETH_LINK_SPEED_10G;
+
+ if (dpaa2_svr_family == SVR_LX2160A)
+ speed_capa |= RTE_ETH_LINK_SPEED_25G | RTE_ETH_LINK_SPEED_40G |
+ RTE_ETH_LINK_SPEED_50G | RTE_ETH_LINK_SPEED_100G;
+
+ return speed_capa;
+}
+
static int
dpaa2_dev_info_get(struct rte_eth_dev *dev,
struct rte_eth_dev_info *dev_info)
@@ -307,9 +380,6 @@ dpaa2_dev_info_get(struct rte_eth_dev *dev,
dev_rx_offloads_nodis;
dev_info->tx_offload_capa = dev_tx_offloads_sup |
dev_tx_offloads_nodis;
- dev_info->speed_capa = RTE_ETH_LINK_SPEED_1G |
- RTE_ETH_LINK_SPEED_2_5G |
- RTE_ETH_LINK_SPEED_10G;
dev_info->dev_capa &= ~RTE_ETH_DEV_CAPA_FLOW_RULE_KEEP;
dev_info->max_hash_mac_addrs = 0;
@@ -326,12 +396,7 @@ dpaa2_dev_info_get(struct rte_eth_dev *dev,
dev_info->default_txportconf.ring_size = CONG_ENTER_TX_THRESHOLD;
dev_info->default_rxportconf.ring_size = DPAA2_RX_DEFAULT_NBDESC;
- if (dpaa2_svr_family == SVR_LX2160A) {
- dev_info->speed_capa |= RTE_ETH_LINK_SPEED_25G |
- RTE_ETH_LINK_SPEED_40G |
- RTE_ETH_LINK_SPEED_50G |
- RTE_ETH_LINK_SPEED_100G;
- }
+ dev_info->speed_capa = priv->speed_capa;
return 0;
}
@@ -1130,6 +1195,7 @@ dpaa2_supported_ptypes_get(struct rte_eth_dev *dev, size_t *no_of_elements)
/*todo -= add more types */
RTE_PTYPE_L2_ETHER,
RTE_PTYPE_L3_IPV4,
+
RTE_PTYPE_L3_IPV4_EXT,
RTE_PTYPE_L3_IPV6,
RTE_PTYPE_L3_IPV6_EXT,
@@ -2976,6 +3042,9 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
DPAA2_PMD_INFO("%s: netdev created, connected to %s",
eth_dev->data->name, dpaa2_dev->ep_name);
+
+ priv->speed_capa = dpaa2_dev_get_speed_capability(eth_dev);
+
return 0;
init_err:
dpaa2_dev_close(eth_dev);
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h
index 6026b378a7..c4133f604f 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.h
+++ b/drivers/net/dpaa2/dpaa2_ethdev.h
@@ -400,6 +400,7 @@ struct dpaa2_dev_priv {
uint16_t dpni_ver_major;
uint16_t dpni_ver_minor;
+ uint32_t speed_capa;
enum rte_dpaa2_dev_type ep_dev_type; /**< Endpoint Device Type */
uint16_t ep_object_id; /**< Endpoint DPAA2 Object ID */
@@ -436,6 +437,17 @@ struct dpaa2_dev_priv {
LIST_HEAD(shaper_profiles, dpaa2_tm_shaper_profile) shaper_profiles;
};
+#define DPNI_GET_MAC_SUPPORTED_IFS_VER_MAJOR 8
+#define DPNI_GET_MAC_SUPPORTED_IFS_VER_MINOR 6
+
+static inline int dpaa2_dev_cmp_dpni_ver(struct dpaa2_dev_priv *priv,
+ uint16_t ver_major, uint16_t ver_minor)
+{
+ if (priv->dpni_ver_major == ver_major)
+ return priv->dpni_ver_minor - ver_minor;
+ return priv->dpni_ver_major - ver_major;
+}
+
int dpaa2_distset_to_dpkg_profile_cfg(uint64_t req_dist_set,
struct dpkg_profile_cfg *kg_cfg);
diff --git a/drivers/net/dpaa2/mc/dpni.c b/drivers/net/dpaa2/mc/dpni.c
index f651f29b02..a1f168dd04 100644
--- a/drivers/net/dpaa2/mc/dpni.c
+++ b/drivers/net/dpaa2/mc/dpni.c
@@ -3493,6 +3493,7 @@ int dpni_sp_enable(struct fsl_mc_io *mc_io, uint32_t cmd_flags, uint16_t token,
/* send command to MC */
return mc_send_command(mc_io, &cmd);
}
+
/**
* dpni_get_mac_statistics() - Get statistics on the connected DPMAC objects
* @mc_io: Pointer to opaque I/O object
@@ -3520,3 +3521,23 @@ int dpni_get_mac_statistics(struct fsl_mc_io *mc_io, uint32_t cmd_flags, uint16_
return mc_send_command(mc_io, &cmd);
}
+
+int dpni_get_mac_speed_capability(struct fsl_mc_io *mc_io, uint32_t cmd_flags, uint16_t token,
+ uint32_t *speed_cap)
+{
+ struct dpni_rsp_mac_speed_cap *rsp_params;
+ struct mc_command cmd = { 0 };
+ int err;
+
+ cmd.header = mc_encode_cmd_header(DPNI_CMDID_GET_MAC_SPEED_CAPABILITY,
+ cmd_flags, token);
+
+ err = mc_send_command(mc_io, &cmd);
+ if (err)
+ return err;
+
+ rsp_params = (struct dpni_rsp_mac_speed_cap *)cmd.params;
+ *speed_cap = le32_to_cpu(rsp_params->speed_cap);
+
+ return 0;
+}
diff --git a/drivers/net/dpaa2/mc/fsl_dpmac.h b/drivers/net/dpaa2/mc/fsl_dpmac.h
index 375d646cfc..61d7573a4b 100644
--- a/drivers/net/dpaa2/mc/fsl_dpmac.h
+++ b/drivers/net/dpaa2/mc/fsl_dpmac.h
@@ -67,6 +67,21 @@ enum dpmac_eth_if {
DPMAC_ETH_IF_1000BASEX,
DPMAC_ETH_IF_USXGMII,
};
+
+enum dpmac_link_speed {
+ DPMAC_LINK_SPEED_10M = 0,
+ DPMAC_LINK_SPEED_100M,
+ DPMAC_LINK_SPEED_1G,
+ DPMAC_LINK_SPEED_2_5G,
+ DPMAC_LINK_SPEED_5G,
+ DPMAC_LINK_SPEED_10G,
+ DPMAC_LINK_SPEED_25G,
+ DPMAC_LINK_SPEED_40G,
+ DPMAC_LINK_SPEED_50G,
+ DPMAC_LINK_SPEED_100G,
+ DPMAC_LINK_SPEED_MAX,
+};
+
/*
* @DPMAC_FEC_NONE: RS-FEC (enabled by default) is disabled
* @DPMAC_FEC_RS: RS-FEC (Clause 91) mode configured
diff --git a/drivers/net/dpaa2/mc/fsl_dpni.h b/drivers/net/dpaa2/mc/fsl_dpni.h
index 2f8125314c..8d28b8ce76 100644
--- a/drivers/net/dpaa2/mc/fsl_dpni.h
+++ b/drivers/net/dpaa2/mc/fsl_dpni.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0)
*
* Copyright 2013-2016 Freescale Semiconductor Inc.
- * Copyright 2016-2023 NXP
+ * Copyright 2016-2025 NXP
*
*/
#ifndef __FSL_DPNI_H
@@ -2017,4 +2017,7 @@ int dpni_sp_enable(struct fsl_mc_io *mc_io, uint32_t cmd_flags, uint16_t token,
int dpni_get_mac_statistics(struct fsl_mc_io *mc_io, uint32_t cmd_flags, uint16_t token,
uint64_t iova_cnt, uint64_t iova_values, uint32_t num_cnt);
+int dpni_get_mac_speed_capability(struct fsl_mc_io *mc_io, uint32_t cmd_flags, uint16_t token,
+ uint32_t *speed_cap);
+
#endif /* __FSL_DPNI_H */
diff --git a/drivers/net/dpaa2/mc/fsl_dpni_cmd.h b/drivers/net/dpaa2/mc/fsl_dpni_cmd.h
index f653f2c0e4..cf4558d540 100644
--- a/drivers/net/dpaa2/mc/fsl_dpni_cmd.h
+++ b/drivers/net/dpaa2/mc/fsl_dpni_cmd.h
@@ -132,6 +132,7 @@
#define DPNI_CMDID_SET_QUEUE_TX_CONFIRMATION_MODE DPNI_CMD(0x281)
#define DPNI_CMDID_GET_QUEUE_TX_CONFIRMATION_MODE DPNI_CMD(0x282)
#define DPNI_CMDID_GET_MAC_STATISTICS DPNI_CMD(0x283)
+#define DPNI_CMDID_GET_MAC_SPEED_CAPABILITY DPNI_CMD(0x284)
/* Macros for accessing command fields smaller than 1byte */
#define DPNI_MASK(field) \
@@ -1031,5 +1032,8 @@ struct dpni_cmd_get_mac_statistics {
uint32_t num_cnt;
};
+struct dpni_rsp_mac_speed_cap {
+ uint32_t speed_cap;
+};
#pragma pack(pop)
#endif /* _FSL_DPNI_CMD_H */
--
2.43.0
next prev parent reply other threads:[~2025-10-14 7:22 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-14 6:40 [PATCH 00/15] dpaa2: Fixes and enhancements for DPMAC, stats, and parser Prashant Gupta
2025-10-14 6:40 ` [PATCH 01/15] net/dpaa2: fix uninitialized variable issue Prashant Gupta
2025-10-14 6:40 ` [PATCH 02/15] net/dpaa2: fix to free buffers from error queue Prashant Gupta
2025-10-14 6:40 ` [PATCH 03/15] net/dpaa2: fix L3/L4 csum results in packet parse Prashant Gupta
2025-10-14 6:40 ` [PATCH 04/15] net/dpaa2: fix to recv packets with additional parse errors Prashant Gupta
2025-10-14 6:40 ` [PATCH 05/15] net/dpaa2: fix error frame dump issue Prashant Gupta
2025-10-14 6:40 ` [PATCH 06/15] net/dpaa2: fix flow rule's resizing issue Prashant Gupta
2025-10-14 6:40 ` [PATCH 07/15] net/dpaa2: add dpmac MC header file Prashant Gupta
2025-10-14 6:40 ` [PATCH 08/15] net/dpaa2: support dpmac counters in stats Prashant Gupta
2025-10-14 6:40 ` Prashant Gupta [this message]
2025-10-14 6:40 ` [PATCH 10/15] drivers: dpaa2 upgrade fslmc base FW to 10.39.0 Prashant Gupta
2025-10-14 6:40 ` [PATCH 11/15] net/dpaa2: replace global variable to driver flag Prashant Gupta
2025-10-14 6:40 ` [PATCH 12/15] net/dpaa2: add devargs to drop parse packets in HW Prashant Gupta
2025-10-14 6:40 ` [PATCH 13/15] net/dpaa2: optimize to prefetch next parser result Prashant Gupta
2025-10-14 6:40 ` [PATCH 14/15] net/dpaa2: add eCPRI header and message dump Prashant Gupta
2025-10-14 6:40 ` [PATCH 15/15] net/dpaa2: add Policer stats for each TC Prashant Gupta
-- strict thread matches above, loose matches on Subject: below --
2025-10-14 6:00 [PATCH 00/15] dpaa2: Fixes and enhancements for DPMAC, stats, and parser Prashant Gupta
2025-10-14 6:00 ` [PATCH 09/15] net/dpaa2: setup the speed cap based on the actual MAC Prashant Gupta
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251014064035.1312896-10-prashant.gupta_3@nxp.com \
--to=prashant.gupta_3@nxp.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=ioana.ciornei@nxp.com \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).