From: Hemant Agrawal <hemant.agrawal@nxp.com>
To: <ferruh.yigit@intel.com>
Cc: <dev@dpdk.org>, <shreyansh.jain@nxp.com>
Subject: [dpdk-dev] [PATCH 2/4] net/dpaa2: improve the error handling in dev init
Date: Wed, 19 Apr 2017 18:39:53 +0530 [thread overview]
Message-ID: <1492607395-5922-2-git-send-email-hemant.agrawal@nxp.com> (raw)
In-Reply-To: <1492607395-5922-1-git-send-email-hemant.agrawal@nxp.com>
Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
drivers/net/dpaa2/dpaa2_ethdev.c | 36 +++++++++++++++---------------------
1 file changed, 15 insertions(+), 21 deletions(-)
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index f4c73de..e9800f4 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -54,6 +54,7 @@
#include "dpaa2_ethdev.h"
static struct rte_dpaa2_driver rte_dpaa2_pmd;
+static int dpaa2_dev_uninit(struct rte_eth_dev *eth_dev);
/**
* Atomically reads the link status information from global
@@ -783,6 +784,7 @@ void dpaa2_dev_stats_reset(struct rte_eth_dev *dev)
if (ret) {
PMD_INIT_LOG(ERR, "Failure in opening dpni@%d device with"
" error code %d\n", hw_id, ret);
+ free(dpni_dev);
return -1;
}
@@ -791,14 +793,14 @@ void dpaa2_dev_stats_reset(struct rte_eth_dev *dev)
if (ret) {
PMD_INIT_LOG(ERR, "Failure cleaning dpni@%d device with"
" error code %d\n", hw_id, ret);
- return -1;
+ goto init_err;
}
ret = dpni_get_attributes(dpni_dev, CMD_PRI_LOW, priv->token, &attr);
if (ret) {
PMD_INIT_LOG(ERR, "Failure in getting dpni@%d attribute, "
" error code %d\n", hw_id, ret);
- return -1;
+ goto init_err;
}
priv->num_tc = attr.num_tcs;
@@ -831,7 +833,7 @@ void dpaa2_dev_stats_reset(struct rte_eth_dev *dev)
ret = dpaa2_alloc_rx_tx_queues(eth_dev);
if (ret) {
PMD_INIT_LOG(ERR, "dpaa2_alloc_rx_tx_queuesFailed\n");
- return -ret;
+ goto init_err;
}
/* Allocate memory for storing MAC addresses */
@@ -841,7 +843,8 @@ void dpaa2_dev_stats_reset(struct rte_eth_dev *dev)
PMD_INIT_LOG(ERR, "Failed to allocate %d bytes needed to "
"store MAC addresses",
ETHER_ADDR_LEN * attr.mac_filter_entries);
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto init_err;
}
ret = dpni_get_primary_mac_addr(dpni_dev, CMD_PRI_LOW,
@@ -850,10 +853,9 @@ void dpaa2_dev_stats_reset(struct rte_eth_dev *dev)
if (ret) {
PMD_INIT_LOG(ERR, "DPNI get mac address failed:"
" Error Code = %d\n", ret);
- return -ret;
+ goto init_err;
}
-
/* ... tx buffer layout ... */
memset(&layout, 0, sizeof(struct dpni_buffer_layout));
layout.options = DPNI_BUF_LAYOUT_OPT_FRAME_STATUS;
@@ -863,7 +865,7 @@ void dpaa2_dev_stats_reset(struct rte_eth_dev *dev)
if (ret) {
PMD_INIT_LOG(ERR, "Error (%d) in setting tx buffer"
" layout", ret);
- return -1;
+ goto init_err;
}
/* ... tx-conf and error buffer layout ... */
@@ -875,7 +877,7 @@ void dpaa2_dev_stats_reset(struct rte_eth_dev *dev)
if (ret) {
PMD_INIT_LOG(ERR, "Error (%d) in setting tx-conf buffer"
" layout", ret);
- return -1;
+ goto init_err;
}
eth_dev->dev_ops = &dpaa2_ethdev_ops;
@@ -886,6 +888,9 @@ void dpaa2_dev_stats_reset(struct rte_eth_dev *dev)
rte_fslmc_vfio_dmamap();
return 0;
+init_err:
+ dpaa2_dev_uninit(eth_dev);
+ return ret;
}
static int
@@ -893,7 +898,7 @@ void dpaa2_dev_stats_reset(struct rte_eth_dev *dev)
{
struct dpaa2_dev_priv *priv = eth_dev->data->dev_private;
struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
- int i, ret;
+ int i;
struct dpaa2_queue *dpaa2_q;
PMD_INIT_FUNC_TRACE();
@@ -920,23 +925,12 @@ void dpaa2_dev_stats_reset(struct rte_eth_dev *dev)
priv->rx_vq[0] = NULL;
}
- /* Allocate memory for storing MAC addresses */
+ /* free memory for storing MAC addresses */
if (eth_dev->data->mac_addrs) {
rte_free(eth_dev->data->mac_addrs);
eth_dev->data->mac_addrs = NULL;
}
- /*Close the device at underlying layer*/
- ret = dpni_close(dpni, CMD_PRI_LOW, priv->token);
- if (ret) {
- PMD_INIT_LOG(ERR, "Failure closing dpni device with"
- " error code %d\n", ret);
- }
-
- /*Free the allocated memory for ethernet private data and dpni*/
- priv->hw = NULL;
- free(dpni);
-
eth_dev->dev_ops = NULL;
eth_dev->rx_pkt_burst = NULL;
eth_dev->tx_pkt_burst = NULL;
--
1.9.1
next prev parent reply other threads:[~2017-04-19 13:10 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-19 13:09 [dpdk-dev] [PATCH 1/4] net/dpaa2: stop using software annotation Hemant Agrawal
2017-04-19 13:09 ` Hemant Agrawal [this message]
2017-05-12 13:51 ` [dpdk-dev] [PATCH 2/4] net/dpaa2: improve the error handling in dev init Ferruh Yigit
2017-04-19 13:09 ` [dpdk-dev] [PATCH 3/4] bus/fslmc: support for multiple parallel dq requests Hemant Agrawal
2017-05-12 13:53 ` Ferruh Yigit
2017-04-19 13:09 ` [dpdk-dev] [PATCH 4/4] net/dpaa2: support parallel recv mode Hemant Agrawal
2017-05-12 13:48 ` Ferruh Yigit
2017-05-15 8:26 ` Hemant Agrawal
2017-05-15 12:37 ` [dpdk-dev] [PATCH v2 00/20] NXP DPAA2 PMD functional enhancements Hemant Agrawal
2017-05-15 12:37 ` [dpdk-dev] [PATCH v2 01/20] mk: change to cortex-a72 Hemant Agrawal
2017-05-15 16:49 ` Ferruh Yigit
2017-05-16 15:06 ` Hemant Agrawal
2017-05-15 12:37 ` [dpdk-dev] [PATCH v2 02/20] net/dpaa2: remove port level buffer layout definition Hemant Agrawal
2017-05-15 16:50 ` Ferruh Yigit
2017-05-15 12:37 ` [dpdk-dev] [PATCH v2 03/20] net/dpaa2: stop using software annotation Hemant Agrawal
2017-05-15 12:37 ` [dpdk-dev] [PATCH v2 04/20] net/dpaa2: improve the error handling in dev init Hemant Agrawal
2017-05-15 12:37 ` [dpdk-dev] [PATCH v2 05/20] bus/fslmc: support for parallel Rx DQ requests Hemant Agrawal
2017-05-15 12:37 ` [dpdk-dev] [PATCH v2 06/20] net/dpaa2: support parallel Rx mode Hemant Agrawal
2017-05-15 12:37 ` Hemant Agrawal
2017-05-15 12:37 ` [dpdk-dev] [PATCH v2 07/20] bus/fslmc: export qbman results in map file Hemant Agrawal
2017-05-15 16:55 ` Ferruh Yigit
2017-05-15 12:37 ` [dpdk-dev] [PATCH v2 08/20] net/dpaa2: add support for congestion notification Hemant Agrawal
2017-05-15 12:37 ` [dpdk-dev] [PATCH v2 09/20] net/dpaa2: add support for tail drop on queue Hemant Agrawal
2017-05-15 12:37 ` [dpdk-dev] [PATCH v2 10/20] bus/fslmc: update TAILQ usages in dpaa2 objects Hemant Agrawal
2017-05-15 12:37 ` [dpdk-dev] [PATCH v2 11/20] net/dpaa2: add support for MAC address filtering Hemant Agrawal
2017-05-15 12:37 ` [dpdk-dev] [PATCH v2 12/20] net/dpaa2: add support for multicast promiscuous mode Hemant Agrawal
2017-05-15 12:37 ` [dpdk-dev] [PATCH v2 13/20] net/dpaa2: add support for VLAN filter and offload Hemant Agrawal
2017-05-15 12:37 ` [dpdk-dev] [PATCH v2 14/20] net/dpaa2: add support for VLAN strip Hemant Agrawal
2017-05-15 12:37 ` [dpdk-dev] [PATCH v2 15/20] net/dpaa2: add link status config support Hemant Agrawal
2017-05-15 12:37 ` [dpdk-dev] [PATCH v2 16/20] net/dpaa2: add support for flow control Hemant Agrawal
2017-05-15 12:37 ` [dpdk-dev] [PATCH v2 17/20] net/dpaa2: configure jumbo frames Hemant Agrawal
2017-05-15 12:37 ` [dpdk-dev] [PATCH v2 18/20] bus/fslmc: add support to detect soc version Hemant Agrawal
2017-05-15 12:37 ` [dpdk-dev] [PATCH v2 19/20] net/dpaa2: add support for Firmware Version get Hemant Agrawal
2017-05-15 12:37 ` [dpdk-dev] [PATCH v2 20/20] bus/fslmc: reducing the debug log messages Hemant Agrawal
2017-05-22 9:39 ` [dpdk-dev] [PATCH v3 00/20] NXP DPAA2 PMD functional enhancements Hemant Agrawal
2017-05-22 9:39 ` [dpdk-dev] [PATCH v3 01/20] mk: change to cortex-a72 Hemant Agrawal
2017-05-22 9:39 ` [dpdk-dev] [PATCH v3 02/20] net/dpaa2: remove port level buffer layout definition Hemant Agrawal
2017-05-22 9:39 ` [dpdk-dev] [PATCH v3 03/20] net/dpaa2: stop using software annotation Hemant Agrawal
2017-05-22 9:39 ` [dpdk-dev] [PATCH v3 04/20] net/dpaa2: improve the error handling in dev init Hemant Agrawal
2017-05-22 9:39 ` [dpdk-dev] [PATCH v3 05/20] bus/fslmc: support for parallel Rx DQ requests Hemant Agrawal
2017-05-22 9:39 ` [dpdk-dev] [PATCH v3 06/20] net/dpaa2: support parallel Rx in eth pmd Hemant Agrawal
2017-05-22 9:39 ` [dpdk-dev] [PATCH v3 07/20] bus/fslmc: export qbman results in map file Hemant Agrawal
2017-05-22 9:39 ` [dpdk-dev] [PATCH v3 08/20] net/dpaa2: add support for congestion notification Hemant Agrawal
2017-05-24 11:45 ` Ferruh Yigit
2017-05-22 9:39 ` [dpdk-dev] [PATCH v3 09/20] net/dpaa2: add support for tail drop on queue Hemant Agrawal
2017-05-22 9:39 ` [dpdk-dev] [PATCH v3 10/20] bus/fslmc: update TAILQ usages in dpaa2 objects Hemant Agrawal
2017-05-22 9:39 ` [dpdk-dev] [PATCH v3 11/20] net/dpaa2: add support for MAC address filtering Hemant Agrawal
2017-05-22 9:39 ` [dpdk-dev] [PATCH v3 12/20] net/dpaa2: add support for multicast promiscuous mode Hemant Agrawal
2017-05-22 9:39 ` [dpdk-dev] [PATCH v3 13/20] net/dpaa2: add support for VLAN filter and offload Hemant Agrawal
2017-05-22 9:39 ` [dpdk-dev] [PATCH v3 14/20] net/dpaa2: add support for VLAN strip Hemant Agrawal
2017-05-22 9:39 ` [dpdk-dev] [PATCH v3 15/20] net/dpaa2: add link status config support Hemant Agrawal
2017-05-22 9:39 ` [dpdk-dev] [PATCH v3 16/20] net/dpaa2: add support for flow control Hemant Agrawal
2017-05-22 9:39 ` [dpdk-dev] [PATCH v3 17/20] net/dpaa2: configure jumbo frames Hemant Agrawal
2017-05-22 9:39 ` [dpdk-dev] [PATCH v3 18/20] bus/fslmc: add support to detect soc version Hemant Agrawal
2017-05-22 9:39 ` [dpdk-dev] [PATCH v3 19/20] net/dpaa2: add support for Firmware Version get Hemant Agrawal
2017-05-24 11:43 ` Ferruh Yigit
2017-05-22 9:39 ` [dpdk-dev] [PATCH v3 20/20] bus/fslmc: reducing the debug log messages Hemant Agrawal
2017-05-24 11:49 ` [dpdk-dev] [PATCH v3 00/20] NXP DPAA2 PMD functional enhancements Ferruh Yigit
2017-05-26 7:51 ` Hemant Agrawal
2017-05-26 6:51 ` [dpdk-dev] [PATCH v4 " Hemant Agrawal
2017-05-26 6:51 ` [dpdk-dev] [PATCH v4 01/20] mk: change to cortex-a72 Hemant Agrawal
2017-05-26 6:51 ` [dpdk-dev] [PATCH v4 02/20] net/dpaa2: remove port level buffer layout definition Hemant Agrawal
2017-05-26 6:51 ` [dpdk-dev] [PATCH v4 03/20] net/dpaa2: stop using software annotation Hemant Agrawal
2017-05-26 6:51 ` [dpdk-dev] [PATCH v4 04/20] net/dpaa2: improve the error handling in dev init Hemant Agrawal
2017-05-26 6:51 ` [dpdk-dev] [PATCH v4 05/20] bus/fslmc: support for parallel Rx DQ requests Hemant Agrawal
2017-05-26 6:51 ` [dpdk-dev] [PATCH v4 06/20] net/dpaa2: support parallel Rx in eth pmd Hemant Agrawal
2017-05-26 6:51 ` [dpdk-dev] [PATCH v4 07/20] bus/fslmc: export qbman results in map file Hemant Agrawal
2017-05-26 6:51 ` [dpdk-dev] [PATCH v4 08/20] net/dpaa2: add support for congestion notification Hemant Agrawal
2017-05-26 6:51 ` [dpdk-dev] [PATCH v4 09/20] net/dpaa2: add support for tail drop on queue Hemant Agrawal
2017-05-26 6:51 ` [dpdk-dev] [PATCH v4 10/20] bus/fslmc: update TAILQ usages in dpaa2 objects Hemant Agrawal
2017-05-26 6:51 ` [dpdk-dev] [PATCH v4 11/20] net/dpaa2: add support for MAC address filtering Hemant Agrawal
2017-05-26 6:51 ` [dpdk-dev] [PATCH v4 12/20] net/dpaa2: add support for multicast promiscuous mode Hemant Agrawal
2017-05-26 6:51 ` [dpdk-dev] [PATCH v4 13/20] net/dpaa2: add support for VLAN filter and offload Hemant Agrawal
2017-05-26 6:51 ` [dpdk-dev] [PATCH v4 14/20] net/dpaa2: add support for VLAN strip Hemant Agrawal
2017-05-26 6:51 ` [dpdk-dev] [PATCH v4 15/20] net/dpaa2: add link status config support Hemant Agrawal
2017-05-26 6:51 ` [dpdk-dev] [PATCH v4 16/20] net/dpaa2: add support for flow control Hemant Agrawal
2017-05-26 6:51 ` [dpdk-dev] [PATCH v4 17/20] net/dpaa2: configure jumbo frames Hemant Agrawal
2017-05-26 6:51 ` [dpdk-dev] [PATCH v4 18/20] bus/fslmc: add support to detect soc version Hemant Agrawal
2017-05-26 8:51 ` Ferruh Yigit
2017-05-26 9:26 ` [dpdk-dev] [PATCH] bus/fslmc: fix license information Shreyansh Jain
2017-05-26 9:22 ` Ferruh Yigit
2017-05-26 6:51 ` [dpdk-dev] [PATCH v4 19/20] net/dpaa2: add support for Firmware Version get Hemant Agrawal
2017-05-26 6:51 ` [dpdk-dev] [PATCH v4 20/20] bus/fslmc: reducing the debug log messages Hemant Agrawal
2017-05-26 8:47 ` [dpdk-dev] [PATCH v4 00/20] NXP DPAA2 PMD functional enhancements Ferruh Yigit
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=1492607395-5922-2-git-send-email-hemant.agrawal@nxp.com \
--to=hemant.agrawal@nxp.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=shreyansh.jain@nxp.com \
/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).