From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50089.outbound.protection.outlook.com [40.107.5.89]) by dpdk.org (Postfix) with ESMTP id 004BC5F2E for ; Thu, 20 Dec 2018 01:20:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DZBU8RC6YLf++UTSExxx6vfLgydETvmktg4Xa5a1lsQ=; b=xgLvnPWgr0PKF8saRfAAwCDcHFhSetvK5EFkXRLtgNlcSk3+RyZcK5bAseqhpWslWj8b1nd0NTCvuvC7KYWB7gafNe/oVKOzvmU/ScUcGcGJ4ogFC3JwdAkh+86ImvZOX74DDI1Gp4U357gd1grousXtEj9vT4Rp0JiKXcu3qTg= Received: from DB3PR0502MB3980.eurprd05.prod.outlook.com (52.134.72.27) by DB3PR0502MB4010.eurprd05.prod.outlook.com (52.134.66.28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1425.22; Thu, 20 Dec 2018 00:20:36 +0000 Received: from DB3PR0502MB3980.eurprd05.prod.outlook.com ([fe80::d43a:3775:8af7:29c6]) by DB3PR0502MB3980.eurprd05.prod.outlook.com ([fe80::d43a:3775:8af7:29c6%3]) with mapi id 15.20.1425.025; Thu, 20 Dec 2018 00:20:36 +0000 From: Yongseok Koh To: Thomas Monjalon CC: Christian Ehrhardt , Adrien Mazarguil , David Wilder , Chao Zhu , dpdk stable Thread-Topic: [dpdk-stable] patch 'net/mlx5: fix build on PPC64' has been queued to LTS release 17.11.5 Thread-Index: AQHUiDluiIHV07TpX0eIr2IKizPXeqWG4zOA Date: Thu, 20 Dec 2018 00:20:36 +0000 Message-ID: References: <20181129231202.30436-1-yskoh@mellanox.com> <20181129231202.30436-103-yskoh@mellanox.com> In-Reply-To: <20181129231202.30436-103-yskoh@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; x-originating-ip: [69.181.245.183] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB3PR0502MB4010; 6:JfmLboQmdPyEkdMSn5l6uMlR0CtGnZXVFjM004Me2EKXR1GDJnqGouHj8nvEbyWyS6f9A2z433UOvDpfsAE/YcXNhwG8OkkNSX/RP1eurfQx8Mjlp01DCOyVRm/aRXyfgaGV0D9qjy4x0O3RezfB+pA6KxS2ZLNZj9BDwivACnGvjRZeDKwmJ6aYvmgYFwNRr+9PnlqYCXnUd5KsjWX6wEAhRHKoieUrq0w+DtqKCQQhEcJHGcknrKr6xYS9BqEs9MvFkoEmbIc2jftHIvRdhLwhE6JeXhWO459Jn87m8KxJtuAz233y+iybwrucHP7ih7EavvpwbPIe74H0V2NLM80uL/yza8zQMrZ+1GQYa2p53sgw2CjQTpUWHPXWpPsY5vOyEQhycxyQg0jsRliACc3H5nPrOdYd9pHkFFNgMRaqEpAeEHX7LZIkBDHrN2DR4grHo0koASCEsOj720TwwA==; 5:wyvYrfXsfUS4GSbrShg1WdafJzlWN1R45AW6nFeFxj+RVVCOpiusZsJSQ1SRCY7ONrYnAWHcz7izR7BvCR6DwSnuE0iWdw78zH13hrLj8k7ACgCp0GCTdO2Jx6xpHe1+2vm6HNQ9vUb+bej3TI4aY94HSenArCnqqmIpMtHGy3Q=; 7:sEt7jgWthPMj+SyklsB2lZr6jyimKKJPDMP92c6lBL8FxyeZOq2SSm9RmagwiUm1obC4r2KKhUw8MA/wi45H1xInaQLSpSSYpqHEk6BEVb1vcsZrJBqr1EijKjXRUuj6Rppp0M5T96CEWSkFHebOIw== x-ms-exchange-antispam-srfa-diagnostics: SOS; x-ms-office365-filtering-correlation-id: d8105d12-63c7-4f2e-7493-08d66610f6cc x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB3PR0502MB4010; x-ms-traffictypediagnostic: DB3PR0502MB4010: x-ld-processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(3230021)(999002)(5005026)(6040522)(2401047)(8121501046)(10201501046)(3002001)(3231475)(944501520)(4982022)(52105112)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123564045)(20161123560045)(201708071742011)(7699051)(76991095); SRVR:DB3PR0502MB4010; BCL:0; PCL:0; RULEID:; SRVR:DB3PR0502MB4010; x-forefront-prvs: 0892FA9A88 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(136003)(376002)(346002)(366004)(39860400002)(69234005)(189003)(199004)(28163001)(3846002)(229853002)(966005)(256004)(106356001)(14454004)(76176011)(6116002)(66066001)(81166006)(97736004)(45080400002)(6486002)(105586002)(2906002)(4326008)(99286004)(6436002)(4001150100001)(6246003)(5660300001)(6306002)(6512007)(81156014)(36756003)(33656002)(25786009)(54906003)(71190400001)(478600001)(83716004)(8936002)(71200400001)(53936002)(186003)(102836004)(6916009)(2616005)(575784001)(53546011)(86362001)(7736002)(316002)(26005)(446003)(68736007)(6506007)(486006)(476003)(11346002)(82746002)(305945005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB3PR0502MB4010; H:DB3PR0502MB3980.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: jom63vDxFeFr/7+ZADwS1igVG+DKaczz7MgNIkmCs+TBBK8AiNUG69hCUB4O1ioL+3Q5cYZT3N4MoURTDv41XBcjhSWDM02l4IMYvOrpVisJ8B8OP3xnTsMygNF1T7aInrxmGBoGH7p2D+2LoSga+NZBLKeTHxHEdylbKu1q09rZg31Oi0dzzhgHmWUne6J0OYcSu+t2nHMOPqN4N6kODFYjvMPoSz2h+OkxFfrEIwFvpfaeA7IQzW3jTqoh59cn3QrimHR57Oyh/nF/qtypgEwmItTXtI4XT3Axmk3HUGCl1Ft6ueNeSbakoLsncAf7 spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="us-ascii" Content-ID: <0F0F1C7059687248B1880AF12D037AA6@eurprd05.prod.outlook.com> Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: d8105d12-63c7-4f2e-7493-08d66610f6cc X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Dec 2018 00:20:36.4670 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0502MB4010 Subject: Re: [dpdk-stable] patch 'net/mlx5: fix build on PPC64' has been queued to LTS release 17.11.5 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: , X-List-Received-Date: Thu, 20 Dec 2018 00:20:38 -0000 Hi, This patch is being removed from stable/17.11 as it was mistakenly merged. Patches having 'fix' keyword in the title were merged even though those don= 't have "Cc: stable@dpdk.org" tag in the commit message. If you think this patch is still needed for stable/17.11, please let me kno= w. Then I'll take it back. Thanks, Yongseok > On Nov 29, 2018, at 3:11 PM, Yongseok Koh wrote: >=20 > Hi, >=20 > FYI, your patch has been queued to LTS release 17.11.5 >=20 > Note it hasn't been pushed to https://emea01.safelinks.protection.outlook= .com/?url=3Dhttp%3A%2F%2Fdpdk.org%2Fbrowse%2Fdpdk-stable&data=3D02%7C01= %7Cyskoh%40mellanox.com%7C40c82295f497460bc8ab08d656508faf%7Ca652971c7d2e4d= 9ba6a4d149256f461b%7C0%7C0%7C636791301339809185&sdata=3DLWhqqLssFQpwxlf= 1yKXdT2cGROcQv8w73TdAwoESdI8%3D&reserved=3D0 yet. > It will be pushed if I get no objections before 12/01/18. So please > shout if anyone has objections. >=20 > Also note that after the patch there's a diff of the upstream commit vs t= he patch applied > to the branch. If the code is different (ie: not only metadata diffs), du= e for example to > a change in context or macro names, please double check it. >=20 > Thanks. >=20 > Yongseok >=20 > --- > From a8cbfdf37a4d6b207bed3e1825956c8bb9f21499 Mon Sep 17 00:00:00 2001 > From: Thomas Monjalon > Date: Wed, 7 Nov 2018 17:00:28 +0100 > Subject: [PATCH] net/mlx5: fix build on PPC64 >=20 > [ upstream commit 725f5dd0bfb50192a2d2341d4cc69084c2c4e03d ] >=20 > The AltiVec header file breaks boolean type: >=20 > error: incompatible types when initializing type > '__vector _bool int' {aka '_vector(4) __bool int'} using type 'int' >=20 > If __APPLE_ALTIVEC__ is defined, then bool type is redefined > and conflicts with stdbool.h. >=20 > There is no good solution to fix it for the whole project without > breaking something else, so a workaround is inserted in mlx5 PMD. > This workaround is not compatible with C++ but there is no C++ in DPDK. >=20 > Suggested-by: Christian Ehrhardt > Suggested-by: Adrien Mazarguil > Signed-off-by: Thomas Monjalon > Tested-by: David Wilder > Acked-by: Chao Zhu > --- > drivers/net/mlx5/mlx5_utils.h | 10 ++++++++++ > 1 file changed, 10 insertions(+) >=20 > diff --git a/drivers/net/mlx5/mlx5_utils.h b/drivers/net/mlx5/mlx5_utils.= h > index e48352f37..572296575 100644 > --- a/drivers/net/mlx5/mlx5_utils.h > +++ b/drivers/net/mlx5/mlx5_utils.h > @@ -43,6 +43,16 @@ >=20 > #include "mlx5_defs.h" >=20 > +/* > + * Compilation workaround for PPC64 when AltiVec is fully enabled, e.g. = std=3Dc11. > + * Otherwise there would be a type conflict between stdbool and altivec. > + */ > +#if defined(__PPC64__) && !defined(__APPLE_ALTIVEC__) > +#undef bool > +/* redefine as in stdbool.h */ > +#define bool _Bool > +#endif > + > /* Bit-field manipulation. */ > #define BITFIELD_DECLARE(bf, type, size) \ > type bf[(((size_t)(size) / (sizeof(type) * CHAR_BIT)) + \ > --=20 > 2.11.0 >=20 > --- > Diff of the applied patch vs upstream commit (please double-check if non= -empty: > --- > --- - 2018-11-29 15:01:49.710766496 -0800 > +++ 0103-net-mlx5-fix-build-on-PPC64.patch 2018-11-29 15:01:45.273961000 = -0800 > @@ -1,8 +1,10 @@ > -From 725f5dd0bfb50192a2d2341d4cc69084c2c4e03d Mon Sep 17 00:00:00 2001 > +From a8cbfdf37a4d6b207bed3e1825956c8bb9f21499 Mon Sep 17 00:00:00 2001 > From: Thomas Monjalon > Date: Wed, 7 Nov 2018 17:00:28 +0100 > Subject: [PATCH] net/mlx5: fix build on PPC64 >=20 > +[ upstream commit 725f5dd0bfb50192a2d2341d4cc69084c2c4e03d ] > + > The AltiVec header file breaks boolean type: >=20 > error: incompatible types when initializing type > @@ -25,10 +27,10 @@ > 1 file changed, 10 insertions(+) >=20 > diff --git a/drivers/net/mlx5/mlx5_utils.h b/drivers/net/mlx5/mlx5_utils.= h > -index 886f60e61..97092c749 100644 > +index e48352f37..572296575 100644 > --- a/drivers/net/mlx5/mlx5_utils.h > +++ b/drivers/net/mlx5/mlx5_utils.h > -@@ -15,6 +15,16 @@ > +@@ -43,6 +43,16 @@ >=20 > #include "mlx5_defs.h" >=20