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 5E8DDA0542 for ; Fri, 7 Feb 2020 16:13:42 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 556791C11E; Fri, 7 Feb 2020 16:13:42 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id C8EC31C130 for ; Fri, 7 Feb 2020 16:13:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581088420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fXxd8ndOQTWqPIC4qBlbfouYEhHq/0U/zsPWCE39/1U=; b=anNL1nRXFN9EUCY59bu2aDjN5OsP8X50FqHfpRL5YC6lGGbs8W8JsNuoQB6FhrA2xhIxZ8 u3HeuM66aOv0XwMB94uFc+XPYW5tLCOCiA/uviWWNBEMWMJBl1iFHPye0DiK3X72ySOW9p CxDBQIz5bYFE/3+iyK2DbeZ9U+qgkeg= 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-289-gApMc3lJOgWK7V5kYQwDpw-1; Fri, 07 Feb 2020 10:13:30 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 841AFDB67; Fri, 7 Feb 2020 15:13:28 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id 39F9A1001DC2; Fri, 7 Feb 2020 15:13:26 +0000 (UTC) From: Kevin Traynor To: Gavin Hu Cc: Phil Yang , Hemant Agrawal , dpdk stable Date: Fri, 7 Feb 2020 15:12:23 +0000 Message-Id: <20200207151248.29804-11-ktraynor@redhat.com> In-Reply-To: <20200207151248.29804-1-ktraynor@redhat.com> References: <20200207151248.29804-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: gApMc3lJOgWK7V5kYQwDpw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'bus/fslmc: remove conflicting memory barrier macro' has been queued to LTS release 18.11.7 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/13/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasi= ng (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/c6f92f38969a664ffd= 4ce174db38a32949929ded Thanks. Kevin. --- >From c6f92f38969a664ffd4ce174db38a32949929ded Mon Sep 17 00:00:00 2001 From: Gavin Hu Date: Thu, 7 Nov 2019 22:35:24 +0100 Subject: [PATCH] bus/fslmc: remove conflicting memory barrier macro [ upstream commit 24ffb8c58963c86be5a53ce61896934a96a83234 ] 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") Signed-off-by: Gavin Hu Reviewed-by: Phil Yang Acked-by: Hemant Agrawal --- 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 d0c7b39f8d..a310c5697e 100644 --- a/drivers/bus/fslmc/mc/fsl_mc_sys.h +++ b/drivers/bus/fslmc/mc/fsl_mc_sys.h @@ -33,9 +33,8 @@ struct fsl_mc_io { #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)) --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-07 15:08:18.103461043 +0000 +++ 0011-bus-fslmc-remove-conflicting-memory-barrier-macro.patch=092020-02-= 07 15:08:17.495063202 +0000 @@ -1 +1 @@ -From 24ffb8c58963c86be5a53ce61896934a96a83234 Mon Sep 17 00:00:00 2001 +From c6f92f38969a664ffd4ce174db38a32949929ded Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 24ffb8c58963c86be5a53ce61896934a96a83234 ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org