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
Subject: [dpdk-stable] [PATCH v11 1/5] bus/fslmc: fix the conflicting dmb function
Date: Sun, 27 Oct 2019 20:52:41 +0800 [thread overview]
Message-ID: <1572180765-49767-2-git-send-email-gavin.hu@arm.com> (raw)
In-Reply-To: <1572180765-49767-1-git-send-email-gavin.hu@arm.com>
In-Reply-To: <1561911676-37718-1-git-send-email-gavin.hu@arm.com>
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
next prev parent reply other threads:[~2019-10-27 12:53 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1566454356-37277-1-git-send-email-gavin.hu@arm.com>
[not found] ` <1561911676-37718-1-git-send-email-gavin.hu@arm.com>
2019-08-22 6:12 ` [dpdk-stable] [PATCH v4 1/6] " Gavin Hu
2019-09-12 11:24 ` [dpdk-stable] [PATCH v5 2/8] " Gavin Hu
2019-09-14 14:59 ` [dpdk-stable] [PATCH v6 1/7] " Gavin Hu
2019-09-27 5:41 ` [dpdk-stable] [PATCH v7 " Gavin Hu
2019-09-27 8:24 ` Hemant Agrawal
2019-10-17 15:06 ` [dpdk-stable] [dpdk-dev] " David Marchand
2019-10-21 9:47 ` [dpdk-stable] [PATCH v8 1/6] " Gavin Hu
2019-10-21 19:00 ` [dpdk-stable] [dpdk-dev] " David Marchand
2019-10-24 10:42 ` [dpdk-stable] [PATCH v9 1/5] " Gavin Hu
2019-10-25 15:39 ` [dpdk-stable] [PATCH v10 " Gavin Hu
2019-10-27 12:52 ` Gavin Hu [this message]
2019-11-04 15:32 ` [dpdk-stable] [PATCH v12 " Gavin Hu
[not found] ` <1573162528-16230-1-git-send-email-david.marchand@redhat.com>
2019-11-07 21:35 ` [dpdk-stable] [PATCH v13 " David Marchand
2019-12-10 6:13 ` [dpdk-stable] [dpdk-dev] " Honnappa Nagarahalli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1572180765-49767-2-git-send-email-gavin.hu@arm.com \
--to=gavin.hu@arm.com \
--cc=Honnappa.Nagarahalli@arm.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=hemant.agrawal@nxp.com \
--cc=jerinj@marvell.com \
--cc=konstantin.ananyev@intel.com \
--cc=nd@arm.com \
--cc=pbhagavatula@marvell.com \
--cc=phil.yang@arm.com \
--cc=ruifeng.wang@arm.com \
--cc=stable@dpdk.org \
--cc=stephen@networkplumber.org \
--cc=steve.capper@arm.com \
--cc=thomas@monjalon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).