From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <yongwang@vmware.com>
Received: from EX13-EDG-OU-001.vmware.com (ex13-edg-ou-001.vmware.com
[208.91.0.189]) by dpdk.org (Postfix) with ESMTP id D55BB2B92
for <dev@dpdk.org>; Mon, 29 Aug 2016 21:35:59 +0200 (CEST)
Received: from sc9-mailhost2.vmware.com (10.113.161.72) by
EX13-EDG-OU-001.vmware.com (10.113.208.155) with Microsoft SMTP Server id
15.0.1156.6; Mon, 29 Aug 2016 12:35:35 -0700
Received: from sc2-edge-ivybridge-01.eng.vmware.com (unknown [10.172.139.164])
by sc9-mailhost2.vmware.com (Postfix) with ESMTP id 3DB60B05F9;
Mon, 29 Aug 2016 12:35:57 -0700 (PDT)
From: Yong Wang <yongwang@vmware.com>
To: <stephen@networkplumber.org>
CC: <dev@dpdk.org>, <gyang@vmware.com>, <diproiettod@vmware.com>,
<jsnell@iki.fi>, Yong Wang <yongwang@vmware.com>
Date: Mon, 29 Aug 2016 12:18:45 -0700
Message-ID: <1472498330-18591-2-git-send-email-yongwang@vmware.com>
X-Mailer: git-send-email 1.9.1
In-Reply-To: <1472498330-18591-1-git-send-email-yongwang@vmware.com>
References: <1471997140-46527-2-git-send-email-yongwang@vmware.com>
<1472498330-18591-1-git-send-email-yongwang@vmware.com>
MIME-Version: 1.0
Content-Type: text/plain
Received-SPF: None (EX13-EDG-OU-001.vmware.com: yongwang@vmware.com does not
designate permitted sender hosts)
Subject: [dpdk-dev] [PATCH v3 1/6] net/vmxnet3: improve error checks and
return values
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Aug 2016 19:36:00 -0000
Signed-off-by: Yong Wang <yongwang@vmware.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Reviewed-by: Juho Snellman <jsnell@iki.fi>
---
drivers/net/vmxnet3/vmxnet3_ethdev.c | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index 5874215..3f944c6 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -360,9 +360,16 @@ vmxnet3_dev_configure(struct rte_eth_dev *dev)
PMD_INIT_FUNC_TRACE();
- if (dev->data->nb_rx_queues > UINT8_MAX ||
- dev->data->nb_tx_queues > UINT8_MAX)
+ if (dev->data->nb_tx_queues > VMXNET3_MAX_TX_QUEUES ||
+ dev->data->nb_rx_queues > VMXNET3_MAX_RX_QUEUES) {
+ PMD_INIT_LOG(ERR, "ERROR: Number of queues not supported");
return -EINVAL;
+ }
+
+ if (!rte_is_power_of_2(dev->data->nb_rx_queues)) {
+ PMD_INIT_LOG(ERR, "ERROR: Number of rx queues not power of 2");
+ return -EINVAL;
+ }
size = dev->data->nb_rx_queues * sizeof(struct Vmxnet3_TxQueueDesc) +
dev->data->nb_tx_queues * sizeof(struct Vmxnet3_RxQueueDesc);
@@ -550,7 +557,7 @@ vmxnet3_setup_driver_shared(struct rte_eth_dev *dev)
static int
vmxnet3_dev_start(struct rte_eth_dev *dev)
{
- int status, ret;
+ int ret;
struct vmxnet3_hw *hw = dev->data->dev_private;
PMD_INIT_FUNC_TRACE();
@@ -567,11 +574,11 @@ vmxnet3_dev_start(struct rte_eth_dev *dev)
/* Activate device by register write */
VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD, VMXNET3_CMD_ACTIVATE_DEV);
- status = VMXNET3_READ_BAR1_REG(hw, VMXNET3_REG_CMD);
+ ret = VMXNET3_READ_BAR1_REG(hw, VMXNET3_REG_CMD);
- if (status != 0) {
+ if (ret != 0) {
PMD_INIT_LOG(ERR, "Device activation: UNSUCCESSFUL");
- return -1;
+ return -EINVAL;
}
/* Disable interrupts */
@@ -583,7 +590,7 @@ vmxnet3_dev_start(struct rte_eth_dev *dev)
*/
ret = vmxnet3_dev_rxtx_init(dev);
if (ret != VMXNET3_SUCCESS) {
- PMD_INIT_LOG(ERR, "Device receive init: UNSUCCESSFUL");
+ PMD_INIT_LOG(ERR, "Device queue init: UNSUCCESSFUL");
return ret;
}
@@ -598,7 +605,7 @@ vmxnet3_dev_start(struct rte_eth_dev *dev)
PMD_INIT_LOG(DEBUG, "Reading events: 0x%X", events);
vmxnet3_process_events(hw);
#endif
- return status;
+ return VMXNET3_SUCCESS;
}
/*
--
1.9.1