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 EE2FFA32A4
for <public@inbox.dpdk.org>; Fri, 25 Oct 2019 17:39:37 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id CE3791D415;
Fri, 25 Oct 2019 17:39:33 +0200 (CEST)
Received: from foss.arm.com (foss.arm.com [217.140.110.172])
by dpdk.org (Postfix) with ESMTP id D03621D40D;
Fri, 25 Oct 2019 17:39:31 +0200 (CEST)
Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14])
by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4E086328;
Fri, 25 Oct 2019 08:39:31 -0700 (PDT)
Received: from net-arm-thunderx2-01.test.ast.arm.com
(net-arm-thunderx2-01.shanghai.arm.com [10.169.40.40])
by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id C345C3F71A;
Fri, 25 Oct 2019 08:39:27 -0700 (PDT)
From: Gavin Hu <gavin.hu@arm.com>
To: dev@dpdk.org
Cc: nd@arm.com, david.marchand@redhat.com, konstantin.ananyev@intel.com,
thomas@monjalon.net, stephen@networkplumber.org, hemant.agrawal@nxp.com,
jerinj@marvell.com, pbhagavatula@marvell.com, Honnappa.Nagarahalli@arm.com,
ruifeng.wang@arm.com, phil.yang@arm.com, steve.capper@arm.com,
stable@dpdk.org
Date: Fri, 25 Oct 2019 23:39:07 +0800
Message-Id: <1572017951-41253-2-git-send-email-gavin.hu@arm.com>
X-Mailer: git-send-email 2.7.4
In-Reply-To: <1572017951-41253-1-git-send-email-gavin.hu@arm.com>
References: <1572017951-41253-1-git-send-email-gavin.hu@arm.com>
In-Reply-To: <1561911676-37718-1-git-send-email-gavin.hu@arm.com>
References: <1561911676-37718-1-git-send-email-gavin.hu@arm.com>
Subject: [dpdk-dev] [PATCH v10 1/5] bus/fslmc: fix the conflicting dmb
function
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>
There are two definitions conflicting each other, for more
details, refer to [1].
include/rte_atomic_64.h:19: error: "dmb" redefined [-Werror]
drivers/bus/fslmc/mc/fsl_mc_sys.h:36: note: this is the location of the
previous definition
#define dmb() {__asm__ __volatile__("" : : : "memory"); }
The fix is to reuse the EAL definition to avoid conflicts.
[1] http://inbox.dpdk.org/users/VI1PR08MB537631AB25F41B8880DCCA988FDF0@
VI1PR08MB5376.eurprd08.prod.outlook.com/T/#u
Fixes: 3af733ba8da8 ("bus/fslmc: introduce MC object functions")
Cc: stable@dpdk.org
Signed-off-by: Gavin Hu <gavin.hu@arm.com>
Reviewed-by: Phil Yang <phi.yang@arm.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
drivers/bus/fslmc/mc/fsl_mc_sys.h | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/bus/fslmc/mc/fsl_mc_sys.h b/drivers/bus/fslmc/mc/fsl_mc_sys.h
index d0c7b39..68ce38b 100644
--- a/drivers/bus/fslmc/mc/fsl_mc_sys.h
+++ b/drivers/bus/fslmc/mc/fsl_mc_sys.h
@@ -31,12 +31,10 @@ struct fsl_mc_io {
#include <errno.h>
#include <sys/uio.h>
#include <linux/byteorder/little_endian.h>
+#include <rte_atomic.h>
-#ifndef dmb
-#define dmb() {__asm__ __volatile__("" : : : "memory"); }
-#endif
-#define __iormb() dmb()
-#define __iowmb() dmb()
+#define __iormb() rte_io_rmb()
+#define __iowmb() rte_io_wmb()
#define __arch_getq(a) (*(volatile uint64_t *)(a))
#define __arch_putq(v, a) (*(volatile uint64_t *)(a) = (v))
#define __arch_putq32(v, a) (*(volatile uint32_t *)(a) = (v))
--
2.7.4