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 030EAA04F0 for ; Tue, 10 Dec 2019 07:13:10 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BFA6491; Tue, 10 Dec 2019 07:13:10 +0100 (CET) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60052.outbound.protection.outlook.com [40.107.6.52]) by dpdk.org (Postfix) with ESMTP id EACCA91; Tue, 10 Dec 2019 07:13:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rjBG8XpaywJS8ADhUqqkFMJ6uhX0bcYthtrLtKUTzzM=; b=U5XYsGui+v4r3vy9PpdGoUr0CVLxEVaXQAgyiY2Xx7ymaRl4zith0UWuW1sWM5JSuLLZLMmRVlBeMx8E/o4D7vDLRF+6HjH8IsSybFFgBgtM944wLa/mEIg95wBw8Es9wQou5CynnvN0PWtuHdZ70M0uwatpVW46U8ou2P0lxsE= Received: from VI1PR08CA0213.eurprd08.prod.outlook.com (2603:10a6:802:15::22) by DBBPR08MB4837.eurprd08.prod.outlook.com (2603:10a6:10:d9::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2516.12; Tue, 10 Dec 2019 06:13:08 +0000 Received: from DB5EUR03FT043.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e0a::205) by VI1PR08CA0213.outlook.office365.com (2603:10a6:802:15::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2516.12 via Frontend Transport; Tue, 10 Dec 2019 06:13:08 +0000 Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dpdk.org; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dpdk.org; dmarc=bestguesspass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB5EUR03FT043.mail.protection.outlook.com (10.152.20.236) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2495.18 via Frontend Transport; Tue, 10 Dec 2019 06:13:08 +0000 Received: ("Tessian outbound 58ad627f3883:v37"); Tue, 10 Dec 2019 06:13:07 +0000 X-CR-MTA-TID: 64aa7808 Received: from dadf8c56691b.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id C157DDB3-D15C-4847-9310-DA0CDEF285EE.1; Tue, 10 Dec 2019 06:13:02 +0000 Received: from EUR02-VE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id dadf8c56691b.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 10 Dec 2019 06:13:02 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H5PvBKxpPfwBZlk4YDez21v2Za3hogBRhlaati0/AtFLdpv8X9SwDgX1I/gFyFCQCcJBXD+wBhKkp06UMeQr29nQsAeydV++X/QQijHaAnHG308luK/alZ0QMrGnyWqZ1auwKy3/f8EhMfM/S1IbBWB6gqQGILSwQHIZ1yWKgoQ8ITWsjh90IzpcT09u1gdpAehZflolkiW4nRDgyszRF1jJkhpvQa/3cQOjnpSH9nPtxWYc2J3gChZ2OCiTtc8J6oGde0boYPARqrPvZMEI+jr8wngH28ySopDRXBl88krP6Il7RGFZTpvlDZSlkTAiof9leGFAnbIGfZ6csbju4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rjBG8XpaywJS8ADhUqqkFMJ6uhX0bcYthtrLtKUTzzM=; b=WEuh14EQysOn0iFXGlZaVTAQZw1dzLluGklIlv9I6h2PQgBA4f9d0QdqYBbIDKpubgWw257SCTQJzgtAzyL27oQYOjO04MS9Lz3USTOLQL6Yc0/jbLm30JzBV5Sr8KQr2TFQ62HkaG+ZbXe+O4YPcbOFZVtxiI1tr34a4Z8ruPGLRA25kwkzMv/9MSZYBFDNzUdvCBwHa4JUdnTFbA3LzjN4GtSuiHD2zQDkUpJhPFs+zi9FKFUx3QtOsqbmeqr538IkaQ1Q7JEwtZVfBWUD7WP3R4VjSd6UzcIaoTdp/i4uPxO7ExykWSMle8cajfmoeyD7gjRx0zQ/TMvXN+tzSw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rjBG8XpaywJS8ADhUqqkFMJ6uhX0bcYthtrLtKUTzzM=; b=U5XYsGui+v4r3vy9PpdGoUr0CVLxEVaXQAgyiY2Xx7ymaRl4zith0UWuW1sWM5JSuLLZLMmRVlBeMx8E/o4D7vDLRF+6HjH8IsSybFFgBgtM944wLa/mEIg95wBw8Es9wQou5CynnvN0PWtuHdZ70M0uwatpVW46U8ou2P0lxsE= Received: from VE1PR08MB5149.eurprd08.prod.outlook.com (20.179.30.27) by VE1PR08MB4800.eurprd08.prod.outlook.com (10.255.114.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2516.13; Tue, 10 Dec 2019 06:13:00 +0000 Received: from VE1PR08MB5149.eurprd08.prod.outlook.com ([fe80::9df4:7af6:b62d:f94e]) by VE1PR08MB5149.eurprd08.prod.outlook.com ([fe80::9df4:7af6:b62d:f94e%7]) with mapi id 15.20.2516.018; Tue, 10 Dec 2019 06:13:00 +0000 From: Honnappa Nagarahalli To: David Marchand , "dev@dpdk.org" CC: nd , "konstantin.ananyev@intel.com" , "Gavin Hu (Arm Technology China)" , "stable@dpdk.org" , "hemant.agrawal@nxp.com" , "Sachin.saxena@nxp.com" , nd Thread-Topic: [dpdk-dev] [PATCH v13 1/5] bus/fslmc: fix the conflicting dmb function Thread-Index: AQHVlbNWcvLXJWOCQE2y1crwqQraa6ezFd4g Date: Tue, 10 Dec 2019 06:13:00 +0000 Message-ID: References: <1561911676-37718-1-git-send-email-gavin.hu@arm.com> <1573162528-16230-1-git-send-email-david.marchand@redhat.com> <1573162528-16230-2-git-send-email-david.marchand@redhat.com> In-Reply-To: <1573162528-16230-2-git-send-email-david.marchand@redhat.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ts-tracking-id: 778b347c-d84d-416a-bb57-ebe7444ca185.0 x-checkrecipientchecked: true Authentication-Results-Original: spf=none (sender IP is ) smtp.mailfrom=Honnappa.Nagarahalli@arm.com; x-originating-ip: [217.140.111.135] x-ms-publictraffictype: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 8f7f3df6-7293-46e5-be53-08d77d3806c4 X-MS-TrafficTypeDiagnostic: VE1PR08MB4800:|VE1PR08MB4800:|DBBPR08MB4837: x-ld-processed: f34e5979-57d9-4aaa-ad4d-b122a662184d,ExtAddr x-ms-exchange-transport-forked: True X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true x-ms-oob-tlc-oobclassifiers: OLM:5516;OLM:5516; x-forefront-prvs: 02475B2A01 X-Forefront-Antispam-Report-Untrusted: SFV:NSPM; SFS:(10009020)(4636009)(346002)(136003)(396003)(376002)(39860400002)(366004)(189003)(13464003)(199004)(54534003)(66446008)(4326008)(316002)(76116006)(305945005)(110136005)(71200400001)(66946007)(52536014)(33656002)(71190400001)(64756008)(966005)(26005)(229853002)(66556008)(186003)(66476007)(54906003)(2906002)(45080400002)(55016002)(9686003)(8936002)(86362001)(7696005)(478600001)(81156014)(5660300002)(53546011)(6506007)(81166006); DIR:OUT; SFP:1101; SCL:1; SRVR:VE1PR08MB4800; H:VE1PR08MB5149.eurprd08.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: arm.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: 81sTzCK7JtsRlGgk9EIMVsiGxbkDldG6xXdS4m7QI5aRYqUDR1N4VP9tp/OgEoMDIDx7rqqN607ZfABoIZ8mJBw4uR38fAowqHv/w7hGvqbZ9kCJpamzndigA0ELthuwGNpdCQGFDpzg3eJAl1DZwlNav2wdjE/HgKoFYzDZHDZ/IRHZdxYorENU4lkrji9uxo+vIHL4KKRts6rbJOwnSPi/v/0K3rOqAkzOQ5z1C2wDlDOvHJBtqIuQ9/tgC6es9ELQ3TKo4xoIsmvXaxB90GTeQNHpRP8U3IqtPSUgjfglFqC8k8y+8PqlddJ+UUCy+wghokHGSR5RdLPUBdl/qknX+L0v1AAX3iBHCcJ90jDY/ef+scug53uOLSNgEPncDLLfmIl4Cy/LRBdUnheQvzuWVIGsPyDwiG7/ch3bjS7P+Nn1/0fxRqTxR3zwXMoPK93F98+cz8Z5GfWleWlf4TEZ7q14Hqi90fkztHZWqxxWXoi1ePEEi8Vx4r96H/oDHgG/dPx9dn2sP6d7NA90ZV5wYB27H3xVVpRQo7m5jMRQIz7jS4C9wok5ffdOfHLK Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR08MB4800 Original-Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Honnappa.Nagarahalli@arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT043.eop-EUR03.prod.protection.outlook.com X-Forefront-Antispam-Report: CIP:63.35.35.123; IPV:CAL; SCL:-1; CTRY:IE; EFV:NLI; SFV:NSPM; SFS:(10009020)(4636009)(376002)(396003)(39860400002)(136003)(346002)(189003)(199004)(54534003)(13464003)(53546011)(45080400002)(70206006)(186003)(356004)(6506007)(70586007)(7696005)(76130400001)(26826003)(966005)(478600001)(86362001)(54906003)(26005)(229853002)(110136005)(5660300002)(55016002)(336012)(9686003)(8936002)(316002)(2906002)(450100002)(52536014)(4326008)(81166006)(81156014)(305945005)(33656002); DIR:OUT; SFP:1101; SCL:1; SRVR:DBBPR08MB4837; H:64aa7808-outbound-1.mta.getcheckrecipient.com; FPR:; SPF:Pass; LANG:en; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; MX:1; A:1; X-MS-Office365-Filtering-Correlation-Id-Prvs: 1e6bc122-9a50-413c-ab2a-08d77d38022d NoDisclaimer: True X-Forefront-PRVS: 02475B2A01 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EEHHJA+X6PRG3JjvGdMkFwtuy5hvTSeQ9CxDkvbCmIW6EyIjzaz9DFySleSTgnC9UQfuVeUoX2DSJJ+j/qNdXl97TFMH4VCdUBP0p144MeB68a+v0jdHRhw8fH/Vuuy9b3OAKNVaJrXVCRsK/xotezoTS1EDRSC8nUTAErKnw44Lej0DAgMJHdv/oZwdn4aQJqF+YlCh67FisnWVG7u5SAwceCJruTBW+mdIVFI2AABB8Evz5ZKQkJH6VEKZL7SB6x5C2Agf5uTCGSbJQtmkKIQ7wUgko/JTbf742UnvFSS/iwc8Ty/9MBn7n0+/QXwYJbVfip6LGNvFRDrKyXEKEr7XVsGXCznrNmLjsyrkdFH5mIHIANgbagObYeZMgig3SaNiBJu04JVbf+xdtA64RJJdLW9/Xi0Ym3ChBqsl/K1Kct+OVqouZSrKCRC8QzB74f6o5M/oFOqgstAQbLogFz6ZUP9AcO4QvAzgtrtJ161fmoeea5umiGfTp7pzDMDeOV3nQ6dAhrNbDKHcnH34LWxE0aBbbHqM08X2l0srGp8GSIJgfHVx0B5FYN8qwF6T X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Dec 2019 06:13:08.0681 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8f7f3df6-7293-46e5-be53-08d77d3806c4 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB4837 Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH v13 1/5] 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" In case there are more versions of the WFE patch, is it ok to merge this pa= tch alone?. It will be one less patch to carry around. Thanks, Honnappa > -----Original Message----- > From: dev On Behalf Of David Marchand > Sent: Thursday, November 7, 2019 3:35 PM > To: dev@dpdk.org > Cc: nd ; konstantin.ananyev@intel.com; Gavin Hu (Arm > Technology China) ; stable@dpdk.org; > hemant.agrawal@nxp.com; Sachin.saxena@nxp.com > Subject: [dpdk-dev] [PATCH v13 1/5] bus/fslmc: fix the conflicting dmb > function >=20 > From: Gavin Hu >=20 > There are two definitions conflicting each other, for more details, refer= to [1]. >=20 > 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= "); } >=20 > The fix is to reuse the EAL definition to avoid conflicts. >=20 > [1] > http://inbox.dpdk.org/users/VI1PR08MB537631AB25F41B8880DCCA988FDF > 0@ > VI1PR08MB5376.eurprd08.prod.outlook.com/T/#u >=20 > Fixes: 3af733ba8da8 ("bus/fslmc: introduce MC object functions") > Cc: stable@dpdk.org >=20 > Signed-off-by: Gavin Hu > Reviewed-by: Phil Yang > Acked-by: Hemant Agrawal > --- > Changelog since v12: > - fixed Phil Yang mail address, >=20 > --- > drivers/bus/fslmc/mc/fsl_mc_sys.h | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) >=20 > diff --git a/drivers/bus/fslmc/mc/fsl_mc_sys.h > b/drivers/bus/fslmc/mc/fsl_mc_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() 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) =3D (v)) > #define __arch_putq32(v, a) (*(volatile uint32_t *)(a) =3D (v)) > -- > 1.8.3.1