From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id E1BB1A04AB; Thu, 7 Nov 2019 22:35:52 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EE3041BFBD; Thu, 7 Nov 2019 22:35:45 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id C360D1BFB2 for ; Thu, 7 Nov 2019 22:35:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573162544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0QTTLLULoPUD5uBF0D4jQoFiBTCejxKAeEAatZtLQ+w=; b=Pxhrt7IJBezenxRBCMneSE9UYZ//AHUnQCPwjvrUqD4/rM2Jj7d78rA7kGNa1d0oNZQRlW UW32ZWvBVoDBAS+nLAnPMHmt9jRllJ/gYbHEVNxAFBVBKGdMadad817cKAPgm3QGlyFElw G8makF0clu931aVh4LDeDsuBN+OLSY4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-53-6Eo6QFTnPN-V4T9cJCIpqw-1; Thu, 07 Nov 2019 16:35:40 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 04EE01800D6B; Thu, 7 Nov 2019 21:35:39 +0000 (UTC) Received: from dmarchan.remote.csb (ovpn-204-222.brq.redhat.com [10.40.204.222]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0EE54608B2; Thu, 7 Nov 2019 21:35:36 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: nd@arm.com, konstantin.ananyev@intel.com, Gavin Hu , stable@dpdk.org, Hemant Agrawal , Sachin Saxena Date: Thu, 7 Nov 2019 22:35:24 +0100 Message-Id: <1573162528-16230-2-git-send-email-david.marchand@redhat.com> In-Reply-To: <1573162528-16230-1-git-send-email-david.marchand@redhat.com> References: <1561911676-37718-1-git-send-email-gavin.hu@arm.com> <1573162528-16230-1-git-send-email-david.marchand@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: 6Eo6QFTnPN-V4T9cJCIpqw-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-dev] [PATCH v13 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Gavin Hu 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 Reviewed-by: Phil Yang Acked-by: Hemant Agrawal --- Changelog since v12: - fixed Phil Yang mail address, --- drivers/bus/fslmc/mc/fsl_mc_sys.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/bus/fslmc/mc/fsl_mc_sys.h b/drivers/bus/fslmc/mc/fsl_m= c_sys.h index d0c7b39..a310c56 100644 --- a/drivers/bus/fslmc/mc/fsl_mc_sys.h +++ b/drivers/bus/fslmc/mc/fsl_mc_sys.h @@ -32,11 +32,10 @@ struct fsl_mc_io { #include #include =20 -#ifndef dmb -#define dmb() {__asm__ __volatile__("" : : : "memory"); } -#endif -#define __iormb()=09dmb() -#define __iowmb()=09dmb() +#include + +#define __iormb()=09rte_io_rmb() +#define __iowmb()=09rte_io_wmb() #define __arch_getq(a)=09=09(*(volatile uint64_t *)(a)) #define __arch_putq(v, a)=09(*(volatile uint64_t *)(a) =3D (v)) #define __arch_putq32(v, a)=09(*(volatile uint32_t *)(a) =3D (v)) --=20 1.8.3.1