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 18830A04F3 for ; Thu, 19 Dec 2019 15:35:07 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0F4811B9BF; Thu, 19 Dec 2019 15:35:07 +0100 (CET) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id 13B861BF78 for ; Thu, 19 Dec 2019 15:35:04 +0100 (CET) Received: by mail-wm1-f66.google.com with SMTP id u2so5843876wmc.3 for ; Thu, 19 Dec 2019 06:35:04 -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=RB1TVjDzpeaHzvyTmSMNxkfoGpJ3aBZh3Vt3qr3zoN0=; b=sMuM4kroBLriMQavQa4jC+naX48EUdSzd8X2MHOCZBmyFPjg3NYZXi5luTIDIM2W5r BoayKETtVDgw5RnYqtWup5qxH2kj01z0n8TO6Q/g2UnDhK4QmtZTMdUoebjyKEaGL5mB MQ53JxuwWzZeEr/MjK+tTwbnq1+vWqvhXYvLdzLTPnDCjSE73S5H4Pu/smmDTUGmok2X GKtlNETdrXM7ufGWrIQhJU2Hlp+MNwwheNZwiZxIGZ8dmwrWFixTTeoIyjuoc2AbVd4e zN6LgR9bLVmr+sXacHQbQlwCsZ+YJ9t3lJ8JZbUaO2sS+rXSdvoqdq/2edQLyuwIgq+7 dIPQ== 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=RB1TVjDzpeaHzvyTmSMNxkfoGpJ3aBZh3Vt3qr3zoN0=; b=Z7FbdhyXU25Tt+RengCgBlMeFsoKaqyAQ7zKmrBjqhrTjO7/FB12I8KLPvl4RA60BH aCOqEPDGYM/Dkv2YmSsCClKWtfj4GjoYGoDJEVJDxmfwljVe3AjfYI3hqPOGj0Bv7k86 OWKOy1oBfHbgWiC1a4QvnoltKByLUw1U08sy09OSZ3LYyc4JzMkKvi7+LgZxGVg8/VSZ 6XbTSeCjfs60LbFSyz9XsLUjaQVqdhyiKTEWD8pTyXMmItAYMxe55pKOnS4ISCBFuIwy nSxQiywu+ELNQFZAw98zVJpPxE2Ya5bOAIHIQwc3Jp1peIKaGq8kdZMIyMlSer6v/NpI 7V0w== X-Gm-Message-State: APjAAAVIp7T+SbX/BEIvUh9FXo+ufWwMe4PeXXcrWZwdn7sk5bRSR9F1 p4uIMMhRzRQgVThupZuwljw= X-Google-Smtp-Source: APXvYqz8uvh0konikc7ES6Jrj2j5AGJbja42NmL+Y7fCfYwWpJqQjuBGURFCCzS3vj7vpqTReN9euQ== X-Received: by 2002:a1c:4d18:: with SMTP id o24mr10347607wmh.35.1576766103813; Thu, 19 Dec 2019 06:35:03 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id e8sm6465094wrt.7.2019.12.19.06.35.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:35:03 -0800 (PST) From: luca.boccassi@gmail.com To: Christian Ehrhardt Cc: David Christensen , Matan Azrad , dpdk stable Date: Thu, 19 Dec 2019 14:32:33 +0000 Message-Id: <20191219143447.21506-6-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219143447.21506-1-luca.boccassi@gmail.com> References: <20191219143447.21506-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx4: fix build on ppc64' has been queued to LTS release 17.11.10 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 17.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/21/19. 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 60d0f2e0794c7b507c4c2f4f9ce5e3ec5a94045a Mon Sep 17 00:00:00 2001 From: Christian Ehrhardt Date: Tue, 13 Aug 2019 13:28:43 +0200 Subject: [PATCH] net/mlx4: fix build on ppc64 [ upstream commit ceadf1a405d9951c6d15ed27e010f5b1a80dbdf5 ] The AltiVec header file breaks boolean type: error: incompatible types when initializing type '__vector _bool int' {aka '_vector(4) __bool int'} using type 'int' If __APPLE_ALTIVEC__ is defined, then bool type is redefined and conflicts with stdbool.h. 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. Related to: 725f5dd0bfb5 ("net/mlx5: fix build on PPC64") Signed-off-by: Christian Ehrhardt Tested-by: David Christensen Acked-by: Matan Azrad --- drivers/net/mlx4/mlx4_utils.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/net/mlx4/mlx4_utils.h b/drivers/net/mlx4/mlx4_utils.h index 4f11405a34..02e6b7be2c 100644 --- a/drivers/net/mlx4/mlx4_utils.h +++ b/drivers/net/mlx4/mlx4_utils.h @@ -43,6 +43,16 @@ #include "mlx4.h" +/* + * Compilation workaround for PPC64 when AltiVec is fully enabled, e.g. std=c11. + * 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 + #ifndef NDEBUG /* -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:26.581472304 +0000 +++ 0006-net-mlx4-fix-build-on-ppc64.patch 2019-12-19 14:32:25.401283865 +0000 @@ -1,8 +1,10 @@ -From ceadf1a405d9951c6d15ed27e010f5b1a80dbdf5 Mon Sep 17 00:00:00 2001 +From 60d0f2e0794c7b507c4c2f4f9ce5e3ec5a94045a Mon Sep 17 00:00:00 2001 From: Christian Ehrhardt Date: Tue, 13 Aug 2019 13:28:43 +0200 Subject: [PATCH] net/mlx4: fix build on ppc64 +[ upstream commit ceadf1a405d9951c6d15ed27e010f5b1a80dbdf5 ] + The AltiVec header file breaks boolean type: error: incompatible types when initializing type @@ -16,7 +18,6 @@ This workaround is not compatible with C++ but there is no C++ in DPDK. Related to: 725f5dd0bfb5 ("net/mlx5: fix build on PPC64") -Cc: stable@dpdk.org Signed-off-by: Christian Ehrhardt Tested-by: David Christensen @@ -26,10 +27,10 @@ 1 file changed, 10 insertions(+) diff --git a/drivers/net/mlx4/mlx4_utils.h b/drivers/net/mlx4/mlx4_utils.h -index a49190252f..74b9d2ecdc 100644 +index 4f11405a34..02e6b7be2c 100644 --- a/drivers/net/mlx4/mlx4_utils.h +++ b/drivers/net/mlx4/mlx4_utils.h -@@ -15,6 +15,16 @@ +@@ -43,6 +43,16 @@ #include "mlx4.h" @@ -43,9 +44,9 @@ +#define bool _Bool +#endif + - extern int mlx4_logtype; - #ifndef NDEBUG + + /* -- 2.20.1