From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <G.Singh@nxp.com>
Received: from EUR03-DB5-obe.outbound.protection.outlook.com
(mail-eopbgr40041.outbound.protection.outlook.com [40.107.4.41])
by dpdk.org (Postfix) with ESMTP id 4AC4D1B493
for <dev@dpdk.org>; Tue, 23 Oct 2018 13:54:03 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
bh=Jib5oihDPr8MLwDgfnjKfo6E8fH7UjPObG54btA40b8=;
b=fmZcYUR7q11FJwYWzxyvXmVnBWqzk5WZEMPzK1zSa3icQAsCo20l1pfCX5omNezXVoPmGcoP00UYPrMBH5BkT3RWWWerFDvyT9ocxyJ0CylkXcJhiwBCRoqpvdiZCeM842gDNqKjsoqt3yVe7LoVXM1dBXU1CLsu6xCdC21X9PQ=
Received: from HE1PR04MB1530.eurprd04.prod.outlook.com (10.164.48.20) by
HE1PR04MB1226.eurprd04.prod.outlook.com (10.162.249.151) with Microsoft SMTP
Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.20.1250.29; Tue, 23 Oct 2018 11:54:00 +0000
Received: from HE1PR04MB1530.eurprd04.prod.outlook.com
([fe80::95cd:198:d5c5:59a4]) by HE1PR04MB1530.eurprd04.prod.outlook.com
([fe80::95cd:198:d5c5:59a4%5]) with mapi id 15.20.1250.028; Tue, 23 Oct 2018
11:54:00 +0000
From: Gagandeep Singh <G.Singh@nxp.com>
To: "dev@dpdk.org" <dev@dpdk.org>, Akhil Goyal <akhil.goyal@nxp.com>
CC: Gagandeep Singh <G.Singh@nxp.com>
Thread-Topic: [PATCH] crypto/caam_jr: fix redefinition error
Thread-Index: AQHUascWD3cwX5K0J0ilrWgcrIInBg==
Date: Tue, 23 Oct 2018 11:54:00 +0000
Message-ID: <20181023115322.16134-1-g.singh@nxp.com>
Accept-Language: en-US
Content-Language: en-US
X-MS-Has-Attach:
X-MS-TNEF-Correlator:
x-clientproxiedby: PN1PR01CA0074.INDPRD01.PROD.OUTLOOK.COM
(2603:1096:c00:1::14) To HE1PR04MB1530.eurprd04.prod.outlook.com
(2a01:111:e400:59a8::20)
authentication-results: spf=none (sender IP is )
smtp.mailfrom=G.Singh@nxp.com;
x-ms-exchange-messagesentrepresentingtype: 1
x-originating-ip: [14.142.187.166]
x-ms-publictraffictype: Email
x-microsoft-exchange-diagnostics: 1; HE1PR04MB1226;
6:CDbw5aeymw2ZE06WZ5qnJxG81ekByR2Fp0XIiK+O5Jmr6PO6Q5zGq2F2VmEvPq2F3PrZMnFllhyr65JN2Jn5j9D9QgOzmCVNAauM5J/ourSYtT9SsORBjhJP+WQT7adJSY75bInShrwvoIGlAqhHgUPn6xc1eiMF5cMjDjuSbNmaf3IDTi2W7P2SFia60LmWcRDcOlDrBtD24UqRtIsShnzEsTJLhRbitWvuQTkluoiPMW0ve9Nbx4/oQ8MOlQ62sOKwCTrjkCxQr+4yB2xsQEWvZWBw0btmODJXdH1TaIYMF9ftXMjgXaR8iwKlQezQnq3tYspPbQqXE8xXjZ1moT5drDjvOqBLO6qYd56ALLRxGJIH9+wSsmvyccgK1L4xPtY/Lm9bitOJ2rMWCIqIgZ0PR4MN0kM5MtWIPVwAuLnX7AkXOHFX/3qCosGafma4UvrdrowfxyQZx7IDpbYKiQiqIQiUOaoiQ7L1SnuR2x8=;
5:nbyjc7hVQOjerH9UUPUKbXrRzIR6C5ZZEEvtKLNBEnzSmlGoszWJYnYLRtDopUAdZL02ZShRuW1oufTns+EdGvimnZOMClROhPGnqie+rYtr6lwCFDtj7VGbOMRmFXwHq6055EFRviHCxW+CwxaQzzIZEKVVIkrYuu7ywqjtXIA=;
7:N8Pi0cW7rZWZEhE1hwMvVrb83JzittqUe+mLKlD3CYcslVYM1a7ghQEmRFo3UF0+Ygy1tnT1943a1Zr0kvRO+Jb4rRVuKkcsne0xErs9coWgGShzyblT/OwvcId0arT0uaGo5UriFqSUBoW3u1ecNfQbbF3vgzUcyNcgj0X9jdlRhFcFdCjVAnKFvizK+N6ACgC5vKNtxfAnSpvu41jdAMJyPFcrUJfWpvjlsdedR46xD/+E0zTziIGpS5JS9w/O
x-ms-office365-filtering-correlation-id: cd3db398-1456-4081-c325-08d638de380d
x-ms-office365-filtering-ht: Tenant
x-microsoft-antispam: BCL:0; PCL:0;
RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020);
SRVR:HE1PR04MB1226;
x-ms-traffictypediagnostic: HE1PR04MB1226:
x-microsoft-antispam-prvs: <HE1PR04MB122620947CFFA68EF7A38C7BE1F50@HE1PR04MB1226.eurprd04.prod.outlook.com>
x-exchange-antispam-report-test: UriScan:(185117386973197);
x-ms-exchange-senderadcheck: 1
x-exchange-antispam-report-cfa-test: BCL:0; PCL:0;
RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231355)(944501410)(52105095)(93006095)(93001095)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201708071742011)(7699051)(76991095);
SRVR:HE1PR04MB1226; BCL:0; PCL:0; RULEID:; SRVR:HE1PR04MB1226;
x-forefront-prvs: 0834BAF534
x-forefront-antispam-report: SFV:NSPM;
SFS:(10009020)(346002)(136003)(396003)(39860400002)(366004)(376002)(18054003)(189003)(199004)(316002)(78486010)(110136005)(68736007)(71190400001)(71200400001)(99286004)(8676002)(81156014)(81166006)(8936002)(478600001)(52116002)(72206003)(2900100001)(6436002)(106356001)(97736004)(6486002)(66066001)(2501003)(5250100002)(5660300001)(4326008)(25786009)(36756003)(6636002)(6512007)(105586002)(53936002)(2906002)(14444005)(256004)(305945005)(86362001)(55236004)(1857600001)(14454004)(26005)(476003)(186003)(102836004)(6116002)(3846002)(1076002)(2616005)(7736002)(6506007)(386003)(486006);
DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR04MB1226;
H:HE1PR04MB1530.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en;
PTR:InfoNoRecords; MX:1; A:1;
received-spf: None (protection.outlook.com: nxp.com does not designate
permitted sender hosts)
x-microsoft-antispam-message-info: MUDl3FcVuo514g/9fpRv955CmCifW3LlnLUGizV0BvFmOQxQ6NdLPf6sb1HEdPMXOQ/1ZNtuoyiwGelMXgzJCfVHKS0oo9Bji8KrkGEfsrdOfbdESaZyld/VBi5J+cXuRlC0//OPXcmpIz+K9kPBYzaDVrsAnfVm/fJohX4m6zP+G7+B2lZ14JPZuLoBzw03yQ/QDZI6xr4SG+t5+1zQoFxalQy23UEoI1mPXx5YD6yIouCNYIHao+Iniaj4hAlGmsfiRWPNmGUbJbVrxe2QS5LFu9xjM+SiB08yuCnip7EUjn7fxeDlF90Slf6l5hBkw+gKtXUf+/NLKgf80XmvFSBVxBWHYtiZyVG+EarGg2I=
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: cd3db398-1456-4081-c325-08d638de380d
X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Oct 2018 11:54:00.6055 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR04MB1226
Subject: [dpdk-dev] [PATCH] crypto/caam_jr: fix redefinition error
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>
X-List-Received-Date: Tue, 23 Oct 2018 11:54:03 -0000
dma_addr_t is already defined in compat.h.
so removing the local definition from caam_jr_config.h
Fixes: b70a67ab70 ("crypto/caam_jr: add HW tuning options")
Signed-off-by: Gagandeep Singh <g.singh@nxp.com>
---
drivers/crypto/caam_jr/caam_jr_config.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/crypto/caam_jr/caam_jr_config.h b/drivers/crypto/caam_=
jr/caam_jr_config.h
index e7855cee6..041187a84 100644
--- a/drivers/crypto/caam_jr/caam_jr_config.h
+++ b/drivers/crypto/caam_jr/caam_jr_config.h
@@ -7,6 +7,8 @@
=20
#include <rte_byteorder.h>
=20
+#include <compat.h>
+
#ifdef RTE_LIBRTE_PMD_CAAM_JR_BE
#define CAAM_BYTE_ORDER __BIG_ENDIAN
#else
@@ -19,8 +21,6 @@
#define CORE_BYTE_ORDER __LITTLE_ENDIAN
#endif
=20
-typedef uint64_t dma_addr_t;
-
#if CORE_BYTE_ORDER !=3D CAAM_BYTE_ORDER
=20
#define cpu_to_caam64 rte_cpu_to_be_64
--=20
2.17.1