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 49DFEA04C3 for ; Fri, 22 Nov 2019 15:42:06 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 415C1237; Fri, 22 Nov 2019 15:42:06 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id A1F442BD5 for ; Fri, 22 Nov 2019 15:42:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574433725; 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=13cM7XEM9Yo/Mgof7sdRsK1RvLBlmKu+LJl2u5gr0gY=; b=ZhEunzM+2bdBkZVE8XIbzqwfZAhnXgTuT0jFRCYMMd1g3+89H8uHW76qaBCpGWaQaU9iL+ bVLMb9QhLZKglGIxn+N26A2F0s7hgnfjkn+0kFT1ktJXjs/gAmqqefm2DW7mWUN/fNjfxU ws3HvnvWj9ucEijuHB+tC2Mkl+UdOus= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-153-FaW3Tf23Noe1RsBtmQjZfA-1; Fri, 22 Nov 2019 09:42:01 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 96A7E1800D41; Fri, 22 Nov 2019 14:42:00 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.118.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id 538DB8516; Fri, 22 Nov 2019 14:41:59 +0000 (UTC) From: Kevin Traynor To: Christian Ehrhardt Cc: David Christensen , Matan Azrad , dpdk stable Date: Fri, 22 Nov 2019 14:40:55 +0000 Message-Id: <20191122144131.21231-9-ktraynor@redhat.com> In-Reply-To: <20191122144131.21231-1-ktraynor@redhat.com> References: <20191122144131.21231-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: FaW3Tf23Noe1RsBtmQjZfA-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/mlx4: fix build on ppc64' has been queued to LTS release 18.11.6 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 18.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/29/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 rebasi= ng (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/c78fa03e94cfce26cb= c492455b76422b66355770 Thanks. Kevin. --- >From c78fa03e94cfce26cbc492455b76422b66355770 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 86abb3b7e..2a550df88 100644 --- a/drivers/net/mlx4/mlx4_utils.h +++ b/drivers/net/mlx4/mlx4_utils.h @@ -16,4 +16,14 @@ #include "mlx4.h" =20 +/* + * Compilation workaround for PPC64 when AltiVec is fully enabled, e.g. st= d=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 + #ifndef NDEBUG =20 --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-11-22 14:36:55.714735760 +0000 +++ 0009-net-mlx4-fix-build-on-ppc64.patch=092019-11-22 14:36:55.152150248 = +0000 @@ -1 +1 @@ -From ceadf1a405d9951c6d15ed27e010f5b1a80dbdf5 Mon Sep 17 00:00:00 2001 +From c78fa03e94cfce26cbc492455b76422b66355770 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ceadf1a405d9951c6d15ed27e010f5b1a80dbdf5 ] + @@ -19 +20,0 @@ -Cc: stable@dpdk.org @@ -29 +30 @@ -index a49190252..74b9d2ecd 100644 +index 86abb3b7e..2a550df88 100644 @@ -45 +46 @@ - extern int mlx4_logtype; + #ifndef NDEBUG