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 759A6A04DB;
Wed, 2 Dec 2020 11:23:13 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 05A95CBB4;
Wed, 2 Dec 2020 11:13:24 +0100 (CET)
Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com
[67.231.148.174]) by dpdk.org (Postfix) with ESMTP id F210FCBA2
for <dev@dpdk.org>; Wed, 2 Dec 2020 11:13:21 +0100 (CET)
Received: from pps.filterd (m0045849.ppops.net [127.0.0.1])
by mx0a-0016f401.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id
0B2A52Ms001859 for <dev@dpdk.org>; Wed, 2 Dec 2020 02:13:20 -0800
Received: from dc5-exch02.marvell.com ([199.233.59.182])
by mx0a-0016f401.pphosted.com with ESMTP id 3568jf82aw-1
(version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT)
for <dev@dpdk.org>; Wed, 02 Dec 2020 02:13:20 -0800
Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com
(10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.2;
Wed, 2 Dec 2020 02:13:18 -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:13:17 -0800
From: <lironh@marvell.com>
To: <jerinj@marvell.com>
CC: <dev@dpdk.org>, Dana Vardi <danat@marvell.com>, Liron Himi
<lironh@marvell.com>
Date: Wed, 2 Dec 2020 12:12:07 +0200
Message-ID: <20201202101212.4717-34-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 33/38] net/mvpp2: change dsa_mode naming
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: Dana Vardi <danat@marvell.com>
change 'dsa_mode' to 'start_hdr' in config file
Signed-off-by: Dana Vardi <danat@marvell.com>
Reviewed-by: Liron Himi <lironh@marvell.com>
---
drivers/net/mvpp2/mrvl_qos.c | 29 +++++++++++++++++++----------
1 file changed, 19 insertions(+), 10 deletions(-)
diff --git a/drivers/net/mvpp2/mrvl_qos.c b/drivers/net/mvpp2/mrvl_qos.c
index 23a014ade..c7bd8825c 100644
--- a/drivers/net/mvpp2/mrvl_qos.c
+++ b/drivers/net/mvpp2/mrvl_qos.c
@@ -20,9 +20,10 @@
/* Parsing tokens. Defined conveniently, so that any correction is easy. */
#define MRVL_TOK_DEFAULT "default"
#define MRVL_TOK_DSA_MODE "dsa_mode"
-#define MRVL_TOK_DSA_MODE_NONE "none"
-#define MRVL_TOK_DSA_MODE_DSA "dsa"
-#define MRVL_TOK_DSA_MODE_EXT_DSA "ext_dsa"
+#define MRVL_TOK_START_HDR "start_hdr"
+#define MRVL_TOK_START_HDR_NONE "none"
+#define MRVL_TOK_START_HDR_DSA "dsa"
+#define MRVL_TOK_START_HDR_EXT_DSA "ext_dsa"
#define MRVL_TOK_DEFAULT_TC "default_tc"
#define MRVL_TOK_DSCP "dscp"
#define MRVL_TOK_MAPPING_PRIORITY "mapping_priority"
@@ -722,25 +723,33 @@ mrvl_get_cfg(const char *key __rte_unused, const char *path, void *extra_args)
continue;
}
+ /* MRVL_TOK_START_HDR replaces MRVL_TOK_DSA_MODE parameter.
+ * MRVL_TOK_DSA_MODE will be supported for backward
+ * compatibillity.
+ */
entry = rte_cfgfile_get_entry(file, sec_name,
+ MRVL_TOK_START_HDR);
+ /* if start_hsr is missing, check if dsa_mode exist instead */
+ if (entry == NULL)
+ entry = rte_cfgfile_get_entry(file, sec_name,
MRVL_TOK_DSA_MODE);
if (entry) {
- if (!strncmp(entry, MRVL_TOK_DSA_MODE_NONE,
- sizeof(MRVL_TOK_DSA_MODE_NONE)))
+ if (!strncmp(entry, MRVL_TOK_START_HDR_NONE,
+ sizeof(MRVL_TOK_START_HDR_NONE)))
(*cfg)->port[n].eth_start_hdr =
PP2_PPIO_HDR_ETH;
- else if (!strncmp(entry, MRVL_TOK_DSA_MODE_DSA,
- sizeof(MRVL_TOK_DSA_MODE_DSA)))
+ else if (!strncmp(entry, MRVL_TOK_START_HDR_DSA,
+ sizeof(MRVL_TOK_START_HDR_DSA)))
(*cfg)->port[n].eth_start_hdr =
PP2_PPIO_HDR_ETH_DSA;
- else if (!strncmp(entry, MRVL_TOK_DSA_MODE_EXT_DSA,
- sizeof(MRVL_TOK_DSA_MODE_EXT_DSA))) {
+ else if (!strncmp(entry, MRVL_TOK_START_HDR_EXT_DSA,
+ sizeof(MRVL_TOK_START_HDR_EXT_DSA))) {
(*cfg)->port[n].eth_start_hdr =
PP2_PPIO_HDR_ETH_EXT_DSA;
} else {
MRVL_LOG(ERR,
"Error in parsing %s value (%s)!\n",
- MRVL_TOK_DSA_MODE, entry);
+ MRVL_TOK_START_HDR, entry);
return -1;
}
} else {
--
2.28.0