From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 6607FA04DB;
Wed, 2 Dec 2020 11:16:12 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 2F049CA58;
Wed, 2 Dec 2020 11:12:46 +0100 (CET)
Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com
[67.231.156.173]) by dpdk.org (Postfix) with ESMTP id 2359ECA58
for <dev@dpdk.org>; Wed, 2 Dec 2020 11:12:44 +0100 (CET)
Received: from pps.filterd (m0045851.ppops.net [127.0.0.1])
by mx0b-0016f401.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id
0B2AAKE1024169 for <dev@dpdk.org>; Wed, 2 Dec 2020 02:12:43 -0800
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;
h=from : to : cc :
subject : date : message-id : in-reply-to : references : mime-version :
content-transfer-encoding : content-type; s=pfpt0220;
bh=Cw3NhmsQ/No3C21NZZecGV0Ll2ms3GRMDwyGTxqd/Jk=;
b=KJ0iRDCF90gYBdJkmXAFMcUYTBqY1vDw+xpKt/B46hj4idfhEpxfI7Y/E5OvdoQehiXy
VMXFcIQROZE0SNBjd0g8V/D2QdgDWCC1VaSnu+vKqmigiuYomXmIcJHCg1z6OojQPnJa
s6qEMscRJI/68NLcTZNIbGerhUrqvVe6mn65AYIelNc/9X1ZwgyJU/purKtScQx2g1Eq
7J3M/AW1lLQ8vlrJYzkZDOjgTVLPmgJPLlg3TJSSHJceyRyLCkpzp0wd42ex/30mq3re
ZmaB9We8EtoYjU2fQb9JFKlyUWpnuKT7g7rpCsVcIBOHFOClDeFLetp9ODmveX/LJCjc dQ==
Received: from sc-exch03.marvell.com ([199.233.58.183])
by mx0b-0016f401.pphosted.com with ESMTP id 355w509r55-1
(version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT)
for <dev@dpdk.org>; Wed, 02 Dec 2020 02:12:41 -0800
Received: from DC5-EXCH02.marvell.com (10.69.176.39) by SC-EXCH03.marvell.com
(10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1497.2;
Wed, 2 Dec 2020 02:12:39 -0800
Received: from pt-lxl0023.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com
(10.69.176.39) with Microsoft SMTP Server id 15.0.1497.2 via Frontend
Transport; Wed, 2 Dec 2020 02:12:38 -0800
From: <lironh@marvell.com>
To: <jerinj@marvell.com>
CC: <dev@dpdk.org>, Yuri Chipchev <yuric@marvell.com>, Liron Himi
<lironh@marvell.com>
Date: Wed, 2 Dec 2020 12:11:45 +0200
Message-ID: <20201202101212.4717-12-lironh@marvell.com>
X-Mailer: git-send-email 2.28.0
In-Reply-To: <20201202101212.4717-1-lironh@marvell.com>
References: <20201202101212.4717-1-lironh@marvell.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.312, 18.0.737
definitions=2020-12-02_04:2020-11-30,
2020-12-02 signatures=0
Subject: [dpdk-dev] [PATCH v1 11/38] net/mvpp2: align checking order
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
From: Yuri Chipchev <yuric@marvell.com>
first check for 'isolated' and then for '!ppio'
Signed-off-by: Yuri Chipchev <yuric@marvell.com>
Reviewed-by: Liron Himi <lironh@marvell.com>
---
drivers/net/mvpp2/mrvl_ethdev.c | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c
index 130f5221d..76847b303 100644
--- a/drivers/net/mvpp2/mrvl_ethdev.c
+++ b/drivers/net/mvpp2/mrvl_ethdev.c
@@ -1007,10 +1007,10 @@ mrvl_promiscuous_enable(struct rte_eth_dev *dev)
struct mrvl_priv *priv = dev->data->dev_private;
int ret;
- if (!priv->ppio)
+ if (priv->isolated)
return 0;
- if (priv->isolated)
+ if (!priv->ppio)
return 0;
ret = pp2_ppio_set_promisc(priv->ppio, 1);
@@ -1037,10 +1037,10 @@ mrvl_allmulticast_enable(struct rte_eth_dev *dev)
struct mrvl_priv *priv = dev->data->dev_private;
int ret;
- if (!priv->ppio)
+ if (priv->isolated)
return 0;
- if (priv->isolated)
+ if (!priv->ppio)
return 0;
ret = pp2_ppio_set_mc_promisc(priv->ppio, 1);
@@ -1067,6 +1067,9 @@ mrvl_promiscuous_disable(struct rte_eth_dev *dev)
struct mrvl_priv *priv = dev->data->dev_private;
int ret;
+ if (priv->isolated)
+ return 0;
+
if (!priv->ppio)
return 0;
@@ -1094,6 +1097,9 @@ mrvl_allmulticast_disable(struct rte_eth_dev *dev)
struct mrvl_priv *priv = dev->data->dev_private;
int ret;
+ if (priv->isolated)
+ return 0;
+
if (!priv->ppio)
return 0;
@@ -1121,10 +1127,10 @@ mrvl_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index)
char buf[RTE_ETHER_ADDR_FMT_SIZE];
int ret;
- if (!priv->ppio)
+ if (priv->isolated)
return;
- if (priv->isolated)
+ if (!priv->ppio)
return;
ret = pp2_ppio_remove_mac_addr(priv->ppio,
@@ -1209,12 +1215,12 @@ mrvl_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)
struct mrvl_priv *priv = dev->data->dev_private;
int ret;
- if (!priv->ppio)
- return 0;
-
if (priv->isolated)
return -ENOTSUP;
+ if (!priv->ppio)
+ return 0;
+
ret = pp2_ppio_set_mac_addr(priv->ppio, mac_addr->addr_bytes);
if (ret) {
char buf[RTE_ETHER_ADDR_FMT_SIZE];
@@ -1590,12 +1596,12 @@ mrvl_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
{
struct mrvl_priv *priv = dev->data->dev_private;
- if (!priv->ppio)
- return -EPERM;
-
if (priv->isolated)
return -ENOTSUP;
+ if (!priv->ppio)
+ return 0;
+
return on ? pp2_ppio_add_vlan(priv->ppio, vlan_id) :
pp2_ppio_remove_vlan(priv->ppio, vlan_id);
}
--
2.28.0