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 E7BB8A327F for ; Mon, 21 Oct 2019 21:01:00 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B5FC91BF52; Mon, 21 Oct 2019 21:01:00 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id 8FAD31BF3F for ; Mon, 21 Oct 2019 21:00:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571684455; 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=IqaXWT2v9y9gm5YuyI9b+NPjwgO5FgxeOLh1mWWrniU=; b=EwQdxbex+R+9eJSxni1nwxobBE6ZW8xI2VIaYhOmahrRDk7QWzI3IwtRLbY0Z7zFuAqAZw xJQ4QDxMBwKyx/fLCoQMmVfEdvzXdorxFpKdOh8FF/X3LBE716s7yrXWg3Xp+4yx5kEtkX EwjT00sCsVoDDEjXAgo7OkIhyTrRxQM= Received: from mail-ua1-f70.google.com (mail-ua1-f70.google.com [209.85.222.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-25-9dRCOv7bNV-lxzHX-05ilA-1; Mon, 21 Oct 2019 15:00:54 -0400 Received: by mail-ua1-f70.google.com with SMTP id k13so1801683uap.9 for ; Mon, 21 Oct 2019 12:00:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=WezMH77QCiBO9MMu0t4BSriS9pgJgIKlTi8lcflKzII=; b=Z/7GNG6wSmGDoy3PZj2hKDb7LHrtoHvu3AeLQSLnatzevyWbnx+4KW8QQt3zWeq84f lhHAhgkb0PiWMMouM9gi5oG/brU7z4pV+5qf4I2FSB/XChy/+oLJYlh3KTs1vCsRfvJT uEG+nKjReYJ/VH/MBqkAv1aOBTU0Z7oDM+wVNcGLMEFwfqTSN4sjuX96Bwo4z37LlK/L x0mCs8cYXQFcrW/i9EngbkWue8Y19uwKtZXPpjxesTuF0Sdtr4Hr4U5VDD+XNMboysD1 nkbDyRhF0j+fVQNxrlmECJRrGYCda7MvyxqdRoO3i67TsNkoYFwlRbsZ095FJ/bmB3Qa Qujw== X-Gm-Message-State: APjAAAWlbqcFLOlFHLY/zqAt2ZpoivmS0L0qa5vISgJQDi1jale4lmOz Oh8FS2v0D2Q5AZGf/TG0A9K0hyJQzCWCpHi5CIaL0X5DvOwNWBYbB59CVYrsj3qu7jzIh1nICD/ sMzX1ApruuiRmxpiBwaA+W4o= X-Received: by 2002:a05:6102:387:: with SMTP id m7mr14627989vsq.105.1571684453626; Mon, 21 Oct 2019 12:00:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqz4tsWl7xjRZJt4KEi6JmMyX6nsexi0m+lpZoLv1l9E0W5NP9LVr7wUUH5e4hNBfgEepacRuvHCdBCCYrpx8nk= X-Received: by 2002:a05:6102:387:: with SMTP id m7mr14627953vsq.105.1571684453234; Mon, 21 Oct 2019 12:00:53 -0700 (PDT) MIME-Version: 1.0 References: <1561911676-37718-1-git-send-email-gavin.hu@arm.com> <1571651279-51857-1-git-send-email-gavin.hu@arm.com> <1571651279-51857-2-git-send-email-gavin.hu@arm.com> In-Reply-To: <1571651279-51857-2-git-send-email-gavin.hu@arm.com> From: David Marchand Date: Mon, 21 Oct 2019 21:00:42 +0200 Message-ID: To: Gavin Hu , Hemant Agrawal Cc: dev , nd , "Ananyev, Konstantin" , Thomas Monjalon , Stephen Hemminger , Jerin Jacob Kollanukkaran , Pavan Nikhilesh , Honnappa Nagarahalli , "Ruifeng Wang (Arm Technology China)" , Phil Yang , Steve Capper , dpdk stable X-MC-Unique: 9dRCOv7bNV-lxzHX-05ilA-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH v8 1/6] bus/fslmc: fix the conflicting dmb function 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" On Mon, Oct 21, 2019 at 11:48 AM Gavin Hu wrote: > > 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@i > VI1PR08MB5376.eurprd08.prod.outlook.com/T/#u This url is broken as reported previously. I can fix when applying, but please take the time to fix basic issues like this when reported. > > 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 Was the last change on using EAL memory barrier properly seen by Hemant ? Just want to be sure he is ok. > --- > 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 > #include > #include > +#include > > -#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) =3D (v)) > #define __arch_putq32(v, a) (*(volatile uint32_t *)(a) =3D (v)) > -- > 2.7.4 > -- David Marchand