From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 3D6B0A04C9
for <public@inbox.dpdk.org>; Wed, 16 Sep 2020 12:37:32 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 1EEDF1C209;
Wed, 16 Sep 2020 12:37:32 +0200 (CEST)
Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com
[67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 786AE1C21C;
Wed, 16 Sep 2020 12:37:27 +0200 (CEST)
Received: from pps.filterd (m0045849.ppops.net [127.0.0.1])
by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id
08GAbRvR018830; Wed, 16 Sep 2020 03:37:27 -0700
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;
h=from : to : cc :
subject : date : message-id : mime-version : content-type; s=pfpt0220;
bh=YH664TmDENqarwR5jTcHgtJrD2txm1ioeAmsFC1N5YA=;
b=lRJZNrdrZ3HTrXXddpW6qDtuodlEdaM39NkQqbAo3rH3LgldOkQpfHZ8+Y3+xussxtEJ
1GU+nJ+twzudstwMYA8Z/6c073Xodi5Wc6AA/G85Rl0LPsDQvhoOgNes7bRGIo7vjO+S
jvotbFEugr1Wt41qgIb0ewvBxafyf2A01dmVFByIFUTvEzBhZlZY0LvMMmvbB+0OILDT
fuPeIFkVuUJKJoNwI2sYU57OG15tJgDb3saPraBs3ERiqMWYg1LOKVSvHK2lBNX1T3z3
NdshvrUuqcgzOKAN75j1HIHKeGOOvECxjQL/bXbYSostLX4o4G/sGZfr3DFejGbVT8A3 UA==
Received: from sc-exch02.marvell.com ([199.233.58.182])
by mx0a-0016f401.pphosted.com with ESMTP id 33k5njjanh-1
(version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);
Wed, 16 Sep 2020 03:37:26 -0700
Received: from DC5-EXCH02.marvell.com (10.69.176.39) by SC-EXCH02.marvell.com
(10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1497.2;
Wed, 16 Sep 2020 03:37:26 -0700
Received: from maili.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, 16 Sep 2020 03:37:26 -0700
Received: from hyd1409.caveonetworks.com (unknown [10.29.45.15])
by maili.marvell.com (Postfix) with ESMTP id 2C88D3F703F;
Wed, 16 Sep 2020 03:37:22 -0700 (PDT)
From: Archana Muniganti <marchana@marvell.com>
To: <akhil.goyal@nxp.com>, <anoobj@marvell.com>, <adwivedi@marvell.com>
CC: Archana Muniganti <marchana@marvell.com>, <dev@dpdk.org>, <stable@dpdk.org>
Date: Wed, 16 Sep 2020 16:06:59 +0530
Message-ID: <1600252620-18201-1-git-send-email-marchana@marvell.com>
X-Mailer: git-send-email 1.8.3.1
MIME-Version: 1.0
Content-Type: text/plain
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235, 18.0.687
definitions=2020-09-16_06:2020-09-16,
2020-09-16 signatures=0
Subject: [dpdk-stable] [PATCH 1/2] common/cpt: remove redundant CPT_BYTE_*
macros
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
The macros can be replaced with actual constants.
Signed-off-by: Archana Muniganti <marchana@marvell.com>
---
drivers/common/cpt/cpt_mcode_defines.h | 3 ---
drivers/common/cpt/cpt_ucode.h | 14 +++++++-------
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/drivers/common/cpt/cpt_mcode_defines.h b/drivers/common/cpt/cpt_mcode_defines.h
index fd306ab..ee2c7f3 100644
--- a/drivers/common/cpt/cpt_mcode_defines.h
+++ b/drivers/common/cpt/cpt_mcode_defines.h
@@ -38,9 +38,6 @@
#define CPT_BLOCK_TYPE1 0
#define CPT_BLOCK_TYPE2 1
-#define CPT_BYTE_16 16
-#define CPT_BYTE_24 24
-#define CPT_BYTE_32 32
#define CPT_MAX_SG_IN_OUT_CNT 32
#define CPT_MAX_SG_CNT (CPT_MAX_SG_IN_OUT_CNT/2)
diff --git a/drivers/common/cpt/cpt_ucode.h b/drivers/common/cpt/cpt_ucode.h
index 44067cf..0cfba0b 100644
--- a/drivers/common/cpt/cpt_ucode.h
+++ b/drivers/common/cpt/cpt_ucode.h
@@ -47,9 +47,9 @@
cpt_fc_ciph_validate_key_aes(uint16_t key_len)
{
switch (key_len) {
- case CPT_BYTE_16:
- case CPT_BYTE_24:
- case CPT_BYTE_32:
+ case 16:
+ case 24:
+ case 32:
return 0;
default:
return -1;
@@ -82,7 +82,7 @@
break;
case AES_XTS:
key_len = key_len / 2;
- if (unlikely(key_len == CPT_BYTE_24)) {
+ if (unlikely(key_len == 24)) {
CPT_LOG_DP_ERR("Invalid AES key len for XTS");
return -1;
}
@@ -128,13 +128,13 @@
{
mc_aes_type_t aes_key_type = 0;
switch (key_len) {
- case CPT_BYTE_16:
+ case 16:
aes_key_type = AES_128_BIT;
break;
- case CPT_BYTE_24:
+ case 24:
aes_key_type = AES_192_BIT;
break;
- case CPT_BYTE_32:
+ case 32:
aes_key_type = AES_256_BIT;
break;
default:
--
1.8.3.1