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 66474A051C for ; Tue, 11 Feb 2020 12:23:58 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5D3312B9C; Tue, 11 Feb 2020 12:23:58 +0100 (CET) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id A478C1BF99 for ; Tue, 11 Feb 2020 12:23:56 +0100 (CET) Received: by mail-wr1-f66.google.com with SMTP id y11so11874343wrt.6 for ; Tue, 11 Feb 2020 03:23:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fMcqvB1o+vi5OV12y/4NLP0JRsflaHcjeS/NsSmHwDw=; b=UNAQ1K1yxXdyJ6sxPSqeEiqs75v03OcS5kZ7LSj1KWmjvG4sVaHQITI0rQdAlHdw3w 7eQex/gu0ZGzO0pV8ZgfnapiAAe1nfQiT18bI/yjiNIGHOrTzcn1j8q2hYK9NbXvSsVY vZLHI0DS5Hkx/UOLSK2YEmqtIYA7HpY818PVydHlZNRhaNb0NytRAOIzOEIHu1Z4t8ow G7OsMhsCoHEDUaPSzKXxS/8q5y04/houbhz8pNvUBCOssCnsTRjlMVwl05RBvHS5DDeg j6DyTwIwB7Fzo+zsuw2VAak5yhVnjQiOfzgi6uflq2PidvUwl9Akp4Xjb4sz8QFwwxNX 8QFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fMcqvB1o+vi5OV12y/4NLP0JRsflaHcjeS/NsSmHwDw=; b=pTlRITsHKoAP9PG7Y0QwwfLcP5X+2X2rJkF5vAp/vIMUgfry2pmmRBY0EjGRIHMcuP Mvwz7qHi4lM9c3MReSJE7+OL0Hx6SD6Ue872WHZOgyILoEuaPhCCAldPHMzYzXvpMyXL KIIOJGgH/kumZKmtiZAoh7gB1pworlRZY9TgFT5AISugDPhuGx0t8QF9C6I7IkuBL5uK gShYbwpOcYmGPS9Cgi7+hKSs9MfS3f3rTr3gW3omcjmt5LhdB9sAeuLN5p0Cv99jhEIg AfRHTJdL0OgPUnMN3TEharDVw+8vPTn+nv+KFSVNkuYbIkdc+Enot6vft8d76AFvLqV9 gSng== X-Gm-Message-State: APjAAAWeNeZYYIAsRrzOMzmkvS+5WHjvhkRTaFvBTNWJUc8AZtjsffEA bgtmqkoWU/YT2XbKsXtL7A0= X-Google-Smtp-Source: APXvYqyAV0ElvnFvC9N2r5nw3RcSxMWkLru55DniKmcf/nw0zyTuxBrExMth7Ja/APD3NAIApsRp1A== X-Received: by 2002:adf:ec4c:: with SMTP id w12mr8513233wrn.124.1581420236403; Tue, 11 Feb 2020 03:23:56 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 4sm3280485wmg.22.2020.02.11.03.23.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:23:55 -0800 (PST) From: luca.boccassi@gmail.com To: Gavin Hu Cc: Phil Yang , Hemant Agrawal , dpdk stable Date: Tue, 11 Feb 2020 11:19:28 +0000 Message-Id: <20200211112216.3929-22-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'bus/fslmc: remove conflicting memory barrier macro' has been queued to stable release 19.11.1 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 stable release 19.11.1 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 rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 0977647e008c421bc5ce409aca4ea3a8007ed484 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_mc_sys.h index d0c7b39f8d..a310c5697e 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 -#ifndef dmb -#define dmb() {__asm__ __volatile__("" : : : "memory"); } -#endif -#define __iormb() dmb() -#define __iowmb() dmb() +#include + +#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.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:39.937369842 +0000 +++ 0022-bus-fslmc-remove-conflicting-memory-barrier-macro.patch 2020-02-11 11:17:38.319999851 +0000 @@ -1,8 +1,10 @@ -From 24ffb8c58963c86be5a53ce61896934a96a83234 Mon Sep 17 00:00:00 2001 +From 0977647e008c421bc5ce409aca4ea3a8007ed484 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]. @@ -17,7 +19,6 @@ 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