From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 31FDDA0C47 for ; Tue, 10 Aug 2021 17:43:42 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2630A4014F; Tue, 10 Aug 2021 17:43:42 +0200 (CEST) Received: from smtp-relay-canonical-0.canonical.com (smtp-relay-canonical-0.canonical.com [185.125.188.120]) by mails.dpdk.org (Postfix) with ESMTP id 36F0A4014F for ; Tue, 10 Aug 2021 17:43:41 +0200 (CEST) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPS id 190953F0A4 for ; Tue, 10 Aug 2021 15:43:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610221; bh=SYHTjWzbxQ0S8yilcAB9ANEK1F9bBlZUwD3B6AoOVPk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=ArCZQy6aXZsOfvoatw9PaUTjhj3TQLTMCsQwb2LaZ0DY/l6fgVVQIUxOlBFT8rkkp vYBvf03mBVlHI5LeL2xKN6eapaLwYibiny0R6AYJY2eFTqXJQoxAQiC3astY3/hCbr XhnAaAJ63+7qKYabF01AOmYgNH4I2qf6D3x2DoxX/gSvNjzZARl5pzGY6X2DVWgakK zzuMht4mNGqC3XTvkxMc7692CVsr5xtNgj5Op4pj1CX+Vf2Dj8rTo/5tGZKliKhfYH J6xaFGE1foAQfC3sGh+DUhmI9PZluU/UUo6Eb8FCA709pzLKj1Xn25Uk/XtzWeUmdH 6lOLCca7qr7rA== Received: by mail-ed1-f72.google.com with SMTP id d12-20020a50fe8c0000b02903a4b519b413so10952971edt.9 for ; Tue, 10 Aug 2021 08:43:41 -0700 (PDT) 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=SYHTjWzbxQ0S8yilcAB9ANEK1F9bBlZUwD3B6AoOVPk=; b=tfMTJks+XnF1klMoxBzQGASlZD5bLFeMXtj4PlfxVmmExlZuPCGEm+ugRNUCEIQb4Y pKFfUtQxvWyS40dvGc/ZrGla+IRFBoDkTVxKZMr+1MkwqO6jZrd/O+AAuK2Mzsy2m0PQ y7ieL/V1alKQKmRLzuXGJ0Ks010QL9A1ciZ4mvBKxkMMT4PtA4EfjGdFZfs0pCs0fdnX y8ILTpISiPLYxHtbFCgl1mmLOBf49Sp9VOTA2S0zVXJOpm0mcwWbBCqbJyKRBtxILWPf i3Ib41MKxuSTS/TKsnklxcOz4Xd8S6ywSEMYRraeMZ0SiM5SYpbZchtDZK/trilhRfk4 3tqQ== X-Gm-Message-State: AOAM533KAHEnWoXB25w2wrW2gtMjGjWkK5cbk2WVpNTkjeAKR8huUhp8 DLMmh8sTlYCAew5iGQNZYRQThj8lhqbWbhavgv6Pm6jtD/B+GTD0rBFGl/kHKmlPYD4SXs1xYFE HGWh+Cu84EWtd0+Q5MDfHO14p X-Received: by 2002:a17:906:4948:: with SMTP id f8mr14072004ejt.187.1628610220642; Tue, 10 Aug 2021 08:43:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxpeFGMSO4QFR/03pJ6cHyoA/3+tkxXCqGwmLLSmwiGW5c9aOAOerFSbh4pm8n5eB+dHAnJNA== X-Received: by 2002:a17:906:4948:: with SMTP id f8mr14071996ejt.187.1628610220445; Tue, 10 Aug 2021 08:43:40 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id dh8sm9664476edb.14.2021.08.10.08.43.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:43:40 -0700 (PDT) From: christian.ehrhardt@canonical.com To: =?UTF-8?q?Juraj=20Linke=C5=A1?= Cc: Maxime Coquelin , dpdk stable Date: Tue, 10 Aug 2021 17:39:41 +0200 Message-Id: <20210810154022.749358-61-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810154022.749358-1-christian.ehrhardt@canonical.com> References: <20210810154022.749358-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/virtio: fix aarch32 build' has been queued to stable release 19.11.10 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 stable release 19.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 08/12/21. 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. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/0336eaa63ab370157d76073c6bc32948c8c4b47a Thanks. Christian Ehrhardt --- >From 0336eaa63ab370157d76073c6bc32948c8c4b47a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juraj=20Linke=C5=A1?= Date: Wed, 7 Jul 2021 15:25:39 +0200 Subject: [PATCH] net/virtio: fix aarch32 build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 143b6270b05cf6693f47f692bf890f7f16f9bfd1 ] NEON vector path of the PMD needs aarch64 support. But it was enabled for aarch32 build as well because aarch32 build had cpu_family set to aarch64. So build for aarch32 will fail due to unsupported intrinsics. Fix aarch32 build by updating meson file to exclude NEON vector implementation for aarch32. Fixes: 749799482a72 ("net/virtio: add to meson build") Signed-off-by: Juraj Linkeš Reviewed-by: Maxime Coquelin --- drivers/net/virtio/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/virtio/meson.build b/drivers/net/virtio/meson.build index 04c7fdf25d..a99365807f 100644 --- a/drivers/net/virtio/meson.build +++ b/drivers/net/virtio/meson.build @@ -13,7 +13,7 @@ if arch_subdir == 'x86' sources += files('virtio_rxtx_simple_sse.c') elif arch_subdir == 'ppc_64' sources += files('virtio_rxtx_simple_altivec.c') -elif arch_subdir == 'arm' and host_machine.cpu_family().startswith('aarch64') +elif arch_subdir == 'arm' and dpdk_conf.get('RTE_ARCH_64') sources += files('virtio_rxtx_simple_neon.c') endif -- 2.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:15.402374417 +0200 +++ 0061-net-virtio-fix-aarch32-build.patch 2021-08-10 15:11:13.058638389 +0200 @@ -1 +1 @@ -From 143b6270b05cf6693f47f692bf890f7f16f9bfd1 Mon Sep 17 00:00:00 2001 +From 0336eaa63ab370157d76073c6bc32948c8c4b47a Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 143b6270b05cf6693f47f692bf890f7f16f9bfd1 ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index 81b0a61baf..01a333ada2 100644 +index 04c7fdf25d..a99365807f 100644 @@ -30,4 +31,4 @@ -@@ -41,7 +41,7 @@ if arch_subdir == 'x86' - sources += files('virtio_rxtx_simple_sse.c') - elif arch_subdir == 'ppc' - sources += files('virtio_rxtx_simple_altivec.c') +@@ -13,7 +13,7 @@ if arch_subdir == 'x86' + sources += files('virtio_rxtx_simple_sse.c') + elif arch_subdir == 'ppc_64' + sources += files('virtio_rxtx_simple_altivec.c') @@ -36,2 +37 @@ - sources += files('virtio_rxtx_packed.c') - sources += files('virtio_rxtx_simple_neon.c') + sources += files('virtio_rxtx_simple_neon.c') @@ -38,0 +39 @@ +