From: Prashant Gupta <prashant.gupta_3@nxp.com>
To: stephen@networkplumber.org, dev@dpdk.org
Cc: Jun Yang <jun.yang@nxp.com>
Subject: [PATCH 40/45] drivers: resolve dpaa2 endpoint in the net driver
Date: Thu, 3 Sep 2026 19:23:48 +0530 [thread overview]
Message-ID: <20260903135353.3358303-41-prashant.gupta_3@nxp.com> (raw)
In-Reply-To: <20260903135353.3358303-1-prashant.gupta_3@nxp.com>
From: Jun Yang <jun.yang@nxp.com>
The DPRC object driver walked every device on the bus and, for each DPNI,
issued dprc_get_connection() to find the object it is wired to. Two
things are wrong with that. The bus keeps the result in
struct rte_dpaa2_device even though only the net driver consumes it, and
a failure to resolve one DPNI's endpoint aborted the creation of the
whole container. The endpoint name was also formatted from endpoint2
outside the DPNI branch, so non-DPNI devices got a name built from
uninitialised or stale data.
Move the lookup to dpaa2_dev_init(), which already knows it is dealing
with a DPNI and can fail the probe of that one port. This also fills in
priv->ep_dev_type, priv->ep_object_id and priv->ep_name, which the net
driver reads for MAC-level operations, recycle/loopback configuration and
rte_pmd_dpaa2_ep_name(), but which nothing assigned. dpsw endpoints are
now recognised, and dpdmux/dpsw names carry the interface index because
those endpoints are per-interface.
Signed-off-by: Jun Yang <jun.yang@nxp.com>
---
drivers/bus/fslmc/bus_fslmc_driver.h | 3 --
drivers/bus/fslmc/portal/dpaa2_hw_dprc.c | 45 +++---------------
drivers/net/dpaa2/dpaa2_ethdev.c | 58 +++++++++++++++++++++++-
drivers/net/dpaa2/dpaa2_recycle.c | 15 +++---
4 files changed, 70 insertions(+), 51 deletions(-)
diff --git a/drivers/bus/fslmc/bus_fslmc_driver.h b/drivers/bus/fslmc/bus_fslmc_driver.h
index b4a5a86318..0d431fdd19 100644
--- a/drivers/bus/fslmc/bus_fslmc_driver.h
+++ b/drivers/bus/fslmc/bus_fslmc_driver.h
@@ -104,10 +104,7 @@ struct rte_dpaa2_device {
struct rte_device device; /**< Inherit core device */
enum rte_dpaa2_dev_type dev_type; /**< Device Type */
uint16_t object_id; /**< DPAA2 Object ID */
- enum rte_dpaa2_dev_type ep_dev_type; /**< Endpoint Device Type */
struct dpaa2_dprc_dev *container;
- uint16_t ep_object_id; /**< Endpoint DPAA2 Object ID */
- char ep_name[RTE_DEV_NAME_MAX_LEN];
struct rte_intr_handle *intr_handle; /**< Interrupt handle */
char name[FSLMC_OBJECT_MAX_LEN]; /**< DPAA2 Object name*/
struct rte_dma_dev *dmadev; /**< DMA device */
diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dprc.c b/drivers/bus/fslmc/portal/dpaa2_hw_dprc.c
index 868ed646af..6441297ecf 100644
--- a/drivers/bus/fslmc/portal/dpaa2_hw_dprc.c
+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dprc.c
@@ -27,7 +27,6 @@ rte_dpaa2_create_dprc_device(int vdev_fd __rte_unused,
struct rte_dpaa2_device *obj)
{
struct dpaa2_dprc_dev *dprc_node;
- struct dprc_endpoint endpoint1, endpoint2;
struct rte_dpaa2_device *dev;
int ret, dprc_id = obj->object_id;
@@ -49,45 +48,13 @@ rte_dpaa2_create_dprc_device(int vdev_fd __rte_unused,
return ret;
}
- RTE_BUS_FOREACH_DEV(dev, &rte_fslmc_bus) {
- /** DPRC is always created before it's children are created.*/
+ /* DPRC is always created before its children are created, so every
+ * device scanned so far belongs to this container. Endpoint lookup is
+ * left to the object drivers, which know how many interfaces their
+ * object has and can report a failure to their own caller.
+ */
+ RTE_BUS_FOREACH_DEV(dev, &rte_fslmc_bus)
dev->container = dprc_node;
- if (dev->dev_type == DPAA2_ETH) {
- int link_state;
-
- memset(&endpoint1, 0, sizeof(struct dprc_endpoint));
- memset(&endpoint2, 0, sizeof(struct dprc_endpoint));
- strcpy(endpoint1.type, "dpni");
- endpoint1.id = dev->object_id;
- ret = dprc_get_connection(&dprc_node->dprc,
- CMD_PRI_LOW,
- dprc_node->token,
- &endpoint1, &endpoint2,
- &link_state);
- if (ret) {
- DPAA2_BUS_ERR("dpni.%d connection failed!",
- dev->object_id);
- dprc_close(&dprc_node->dprc, CMD_PRI_LOW,
- dprc_node->token);
- rte_free(dprc_node);
- return ret;
- }
-
- if (!strcmp(endpoint2.type, "dpmac"))
- dev->ep_dev_type = DPAA2_MAC;
- else if (!strcmp(endpoint2.type, "dpni"))
- dev->ep_dev_type = DPAA2_ETH;
- else if (!strcmp(endpoint2.type, "dpdmux"))
- dev->ep_dev_type = DPAA2_MUX;
- else
- dev->ep_dev_type = DPAA2_UNKNOWN;
-
- dev->ep_object_id = endpoint2.id;
- } else {
- dev->ep_dev_type = DPAA2_UNKNOWN;
- }
- sprintf(dev->ep_name, "%s.%d", endpoint2.type, endpoint2.id);
- }
TAILQ_INSERT_TAIL(&dprc_dev_list, dprc_node, next);
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index 34f1e00b12..7cd38ddce6 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -3927,6 +3927,55 @@ dpaa2_get_devargs(struct rte_devargs *devargs, const char *key)
return 1;
}
+/* Resolve the object this DPNI is wired to inside its DPRC container. The
+ * endpoint decides whether MAC-level operations (link, promisc, flow control)
+ * are available, and it is reported to the application by
+ * rte_pmd_dpaa2_ep_name().
+ */
+static int
+dpaa2_dev_ep_init(struct rte_dpaa2_device *dpaa2_dev,
+ struct dpaa2_dev_priv *priv)
+{
+ struct dpaa2_dprc_dev *dprc_node = dpaa2_dev->container;
+ struct dprc_endpoint endpoint1, endpoint2;
+ int link_state, ret;
+
+ memset(&endpoint1, 0, sizeof(endpoint1));
+ memset(&endpoint2, 0, sizeof(endpoint2));
+ strlcpy(endpoint1.type, "dpni", sizeof(endpoint1.type));
+ endpoint1.id = dpaa2_dev->object_id;
+ ret = dprc_get_connection(&dprc_node->dprc, CMD_PRI_LOW,
+ dprc_node->token, &endpoint1, &endpoint2,
+ &link_state);
+ if (ret != 0)
+ return ret;
+
+ if (strcmp(endpoint2.type, "dpmac") == 0)
+ priv->ep_dev_type = DPAA2_MAC;
+ else if (strcmp(endpoint2.type, "dpni") == 0)
+ priv->ep_dev_type = DPAA2_ETH;
+ else if (strcmp(endpoint2.type, "dpdmux") == 0)
+ priv->ep_dev_type = DPAA2_MUX;
+ else if (strcmp(endpoint2.type, "dpsw") == 0)
+ priv->ep_dev_type = DPAA2_SW;
+ else
+ priv->ep_dev_type = DPAA2_UNKNOWN;
+
+ priv->ep_object_id = endpoint2.id;
+
+ /* dpdmux and dpsw endpoints are per-interface, so the interface index
+ * is part of the name.
+ */
+ if (priv->ep_dev_type == DPAA2_MUX || priv->ep_dev_type == DPAA2_SW)
+ snprintf(priv->ep_name, sizeof(priv->ep_name), "%s.%d.%d",
+ endpoint2.type, endpoint2.id, endpoint2.if_id);
+ else
+ snprintf(priv->ep_name, sizeof(priv->ep_name), "%s.%d",
+ endpoint2.type, endpoint2.id);
+
+ return 0;
+}
+
static int
dpaa2_dev_init(struct rte_eth_dev *eth_dev)
{
@@ -4020,6 +4069,13 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
goto init_err;
}
+ ret = dpaa2_dev_ep_init(dpaa2_dev, priv);
+ if (ret) {
+ DPAA2_PMD_ERR("Failure in get dpni@%d endpoint, err code %d",
+ hw_id, ret);
+ goto init_err;
+ }
+
ret = dpni_get_api_version(dpni_dev, CMD_PRI_LOW, &priv->dpni_ver_major,
&priv->dpni_ver_minor);
if (ret) {
@@ -4254,7 +4310,7 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
priv->sp_protocol = dpaa2_dev->bus_info->sp_protocol;
DPAA2_PMD_INFO("%s: netdev created, connected to %s",
- eth_dev->data->name, dpaa2_dev->ep_name);
+ eth_dev->data->name, priv->ep_name);
priv->speed_capa = dpaa2_dev_get_speed_capability(eth_dev);
diff --git a/drivers/net/dpaa2/dpaa2_recycle.c b/drivers/net/dpaa2/dpaa2_recycle.c
index ed038c204b..acf4a8b320 100644
--- a/drivers/net/dpaa2/dpaa2_recycle.c
+++ b/drivers/net/dpaa2/dpaa2_recycle.c
@@ -628,18 +628,18 @@ dpaa2_dev_recycle_config(struct rte_eth_dev *eth_dev)
return 0;
}
- if (dpaa2_dev->ep_dev_type == DPAA2_MAC) {
+ if (priv->ep_dev_type == DPAA2_MAC) {
/** For dpmac-dpni connection,
* try setting serdes loopback as recycle device at first.
*/
if (dpaa2_svr_family == SVR_LS2088A) {
- ret = ls_serdes_eth_lpbk(dpaa2_dev->ep_object_id, 1);
+ ret = ls_serdes_eth_lpbk(priv->ep_object_id, 1);
if (!ret) {
priv->flags |= DPAA2_TX_SERDES_LOOPBACK_MODE;
return 0;
}
} else if (dpaa2_svr_family == SVR_LX2160A) {
- ret = lx_serdes_eth_lpbk(dpaa2_dev->ep_object_id, 1);
+ ret = lx_serdes_eth_lpbk(priv->ep_object_id, 1);
if (!ret) {
priv->flags |= DPAA2_TX_SERDES_LOOPBACK_MODE;
return 0;
@@ -668,8 +668,8 @@ dpaa2_dev_recycle_config(struct rte_eth_dev *eth_dev)
return 0;
}
- if (dpaa2_dev->ep_dev_type == DPAA2_ETH &&
- dpaa2_dev->object_id == dpaa2_dev->ep_object_id) {
+ if (priv->ep_dev_type == DPAA2_ETH &&
+ dpaa2_dev->object_id == priv->ep_object_id) {
priv->flags |= DPAA2_TX_DPNI_LOOPBACK_MODE;
return 0;
@@ -682,7 +682,6 @@ int
dpaa2_dev_recycle_deconfig(struct rte_eth_dev *eth_dev)
{
struct dpaa2_dev_priv *priv = eth_dev->data->dev_private;
- struct rte_dpaa2_device *dpaa2_dev = RTE_CLASS_TO_BUS_DEVICE(eth_dev, *dpaa2_dev);
struct fsl_mc_io *dpni_dev = eth_dev->process_private;
struct dpni_port_cfg port_cfg;
int ret = 0;
@@ -692,7 +691,7 @@ dpaa2_dev_recycle_deconfig(struct rte_eth_dev *eth_dev)
if (priv->flags & DPAA2_TX_SERDES_LOOPBACK_MODE) {
if (dpaa2_svr_family == SVR_LS2088A) {
- ret = ls_serdes_eth_lpbk(dpaa2_dev->ep_object_id, 0);
+ ret = ls_serdes_eth_lpbk(priv->ep_object_id, 0);
if (ret) {
DPAA2_PMD_WARN("Error(%d) to disable Serdes loopback",
ret);
@@ -700,7 +699,7 @@ dpaa2_dev_recycle_deconfig(struct rte_eth_dev *eth_dev)
priv->flags &= ~DPAA2_TX_SERDES_LOOPBACK_MODE;
}
} else if (dpaa2_svr_family == SVR_LX2160A) {
- ret = lx_serdes_eth_lpbk(dpaa2_dev->ep_object_id, 0);
+ ret = lx_serdes_eth_lpbk(priv->ep_object_id, 0);
if (ret) {
DPAA2_PMD_WARN("Error(%d) to disable Serdes loopback",
ret);
--
2.43.0
next prev parent reply other threads:[~2026-09-03 13:58 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-03 13:53 [PATCH 00/45] net/dpaa2: features and fixes for NXP DPAA2 drivers Prashant Gupta
2026-09-03 13:53 ` [PATCH 01/45] crypto/dpaa2_sec: fix buffer overflow in GCM decrypt Prashant Gupta
2026-09-03 13:53 ` [PATCH 02/45] crypto/dpaa2_sec: fix FLE pool leak on sec FD build failure Prashant Gupta
2026-09-03 13:53 ` [PATCH 03/45] crypto/dpaa2_sec: support AES-GMAC Prashant Gupta
2026-09-03 13:53 ` [PATCH 04/45] crypto/dpaa2_sec: increase ivsize range for AES-CTR Prashant Gupta
2026-09-03 13:53 ` [PATCH 05/45] crypto/dpaa2_sec: add missing ECN capability Prashant Gupta
2026-09-03 13:53 ` [PATCH 06/45] crypto/dpaa2_sec: add support for env variables Prashant Gupta
2026-09-03 13:53 ` [PATCH 07/45] drivers: fix double free of dpaa2 device on uninit Prashant Gupta
2026-09-03 14:05 ` David Marchand
2026-09-03 13:53 ` [PATCH 08/45] net/dpaa2: fix integer overflow in CCSR region mapping Prashant Gupta
2026-09-03 13:53 ` [PATCH 09/45] dma/dpaa2: fix array-bounds warning in dequeue path Prashant Gupta
2026-09-03 13:53 ` [PATCH 10/45] bus/fslmc: defer bus initialization to probe Prashant Gupta
2026-09-03 13:53 ` [PATCH 11/45] dma/dpaa2: validate IOVA in pre-populate helpers Prashant Gupta
2026-09-03 13:53 ` [PATCH 12/45] dma/dpaa2: optimize context index ring enqueue Prashant Gupta
2026-09-03 13:53 ` [PATCH 13/45] drivers: add dpaa2 DMA bypass memory translation option Prashant Gupta
2026-09-03 13:53 ` [PATCH 14/45] mempool/dpaa2: support ops index from primary in secondary Prashant Gupta
2026-09-03 13:53 ` [PATCH 15/45] net/dpaa2: set Tx confirmation on device init Prashant Gupta
2026-09-03 13:53 ` [PATCH 16/45] drivers: optimize dpaa2 Tx queue and channel mapping Prashant Gupta
2026-09-03 13:53 ` [PATCH 17/45] net/dpaa2: support larger burst size Prashant Gupta
2026-09-03 13:53 ` [PATCH 18/45] net/dpaa2: support MPLS and PPPoE flow distribution Prashant Gupta
2026-09-03 13:53 ` [PATCH 19/45] net/dpaa2: support meter and policing Prashant Gupta
2026-09-03 13:53 ` [PATCH 20/45] net/dpaa2: support flow drop action Prashant Gupta
2026-09-03 13:53 ` [PATCH 21/45] net/dpaa2: set default flow miss action per device Prashant Gupta
2026-09-03 13:53 ` [PATCH 22/45] net/dpaa2: identify Rx mbuf hash information by FLC Prashant Gupta
2026-09-03 13:53 ` [PATCH 23/45] net/dpaa2: add minimum key size support Prashant Gupta
2026-09-03 13:53 ` [PATCH 24/45] net/dpaa2: restructure dpaa2 parser processing Prashant Gupta
2026-09-03 13:53 ` [PATCH 25/45] net/dpaa2: parse tunnel and fragmented packet types Prashant Gupta
2026-09-03 13:53 ` [PATCH 26/45] net/dpaa2: remove unused soft parser driver Prashant Gupta
2026-09-03 13:53 ` [PATCH 27/45] drivers: refresh dpaa2 MC and SoC version info Prashant Gupta
2026-09-03 13:53 ` [PATCH 28/45] drivers: identify dpaa2 soft parser protocol Prashant Gupta
2026-09-03 13:53 ` [PATCH 29/45] drivers: assign dpaa2 Rx CGID per traffic class Prashant Gupta
2026-09-03 13:53 ` [PATCH 30/45] drivers: inherit dpaa2 rxq config for event queue Prashant Gupta
2026-09-03 13:53 ` [PATCH 31/45] net/dpaa2: rename Rx queue flags Prashant Gupta
2026-09-03 13:53 ` [PATCH 32/45] drivers: rework dpaa2 Tx confirmation Prashant Gupta
2026-09-03 13:53 ` [PATCH 33/45] net/dpaa2: ptp enhancements Prashant Gupta
2026-09-03 13:53 ` [PATCH 34/45] net/dpaa2: remove unused soft parser Tx code Prashant Gupta
2026-09-03 13:53 ` [PATCH 35/45] net/dpaa2: update MC dpni QoS and flow steering API Prashant Gupta
2026-09-03 13:53 ` [PATCH 36/45] net/dpaa2: enhance xstat implementation Prashant Gupta
2026-09-03 13:53 ` [PATCH 37/45] net/dpaa2: rework flow engine Prashant Gupta
2026-09-03 13:53 ` [PATCH 38/45] net/dpaa2: support Rx mempool per traffic class Prashant Gupta
2026-09-03 13:53 ` [PATCH 39/45] drivers: consume dpaa2 DQRR entries in batches Prashant Gupta
2026-09-03 13:53 ` Prashant Gupta [this message]
2026-09-03 13:53 ` [PATCH 41/45] drivers: align dpaa2 event port depths with hardware rings Prashant Gupta
2026-09-03 13:53 ` [PATCH 42/45] net/dpaa2: read MC version from device private data Prashant Gupta
2026-09-03 13:53 ` [PATCH 43/45] net/dpaa2: do not overwrite mbuf hash with drop priority Prashant Gupta
2026-09-03 13:53 ` [PATCH 44/45] bus/fslmc: reduce probe-time logging and MC traffic Prashant Gupta
2026-09-03 13:53 ` [PATCH 45/45] net/dpaa2: reject Rx queue deferred start 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=20260903135353.3358303-41-prashant.gupta_3@nxp.com \
--to=prashant.gupta_3@nxp.com \
--cc=dev@dpdk.org \
--cc=jun.yang@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