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 3B2EEA0C4C for ; Mon, 12 Jul 2021 15:16:05 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 330FF4119E; Mon, 12 Jul 2021 15:16:05 +0200 (CEST) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mails.dpdk.org (Postfix) with ESMTP id C780540685 for ; Mon, 12 Jul 2021 15:16:03 +0200 (CEST) Received: by mail-wr1-f45.google.com with SMTP id g16so15673625wrw.5 for ; Mon, 12 Jul 2021 06:16:03 -0700 (PDT) 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=8YtNYxGr9xSgIEgm3P1VBLk2qZzJe6sZkK4YpMn6U4U=; b=cbEam2HU6Pi/ejnbYYAr8Pb+r5jqRVpmtyGVFstJPIn/xsJj+InpShZ1iHnvDFYpiH NyyjWUo9oTBD2B0+T1Nb8LWZYVsu3HflIo/vLXh05uqGiDScE8haVMbiaADsLzFrt5qa 6txMhAljRFm6msG1tSKgfNeqv4af6BTxo5gVDFWamOHIfnNOMaI1WiQ4nbI4CaohbapF cI3fn9XolpvVFVppW2WWJFxDVPJP20Pgi/vWuPj9NBPs2Je0ujw+4JFPkcAQHeZ1a7UF SYM6D/11kGwiXFZ1wdlLzjtmd8Yzl0dBrTGcPQOypQ+2fPEO1m3kR1pU766/UN8a1zEu gjqg== 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=8YtNYxGr9xSgIEgm3P1VBLk2qZzJe6sZkK4YpMn6U4U=; b=KKOYAjZddQzX3tllh16H/fFAyveJOUSBxV/M8sDFjArt1IX2zo/GHanXioWfRVFtOx y/HLhyQvcLOGokfol2WWEkiOLn634cr9gXC0f2Gc+SRx7O4vVcNDYGd/dhr+I3PKthR3 rrjFGy9JG4NtdfguWLSxa6/wqeLVYfetFVZEnFsLEr7OoakfWx0U+lvxio7Ek24YV7ly Shh5MazvqtGxwhmpad2HJsNQ9SZgxu5wrN0ETwHdn1Qv+BROFOYCEewn8jT3r7XS6Wfj FSVmQM/B9qnztyAzNkDouljurI3YQyaiscHvXggkwKqcyAFaw1CXIbftPMVKNCjFOTrZ VTAw== X-Gm-Message-State: AOAM533YBGf3jzTgabteh+pR4ZIdQIkS8c/D5GxiIgIXo0mmMlMjtTVA FLEZCDCLOvjEIh1B9P5EkE4= X-Google-Smtp-Source: ABdhPJzUaUbH9S0hD28maOkdOfC84HVFuOivzJEhYiq8uqopjQJICfPylysLjjlec4l9q+mjeYOhDA== X-Received: by 2002:a5d:6b06:: with SMTP id v6mr60683414wrw.146.1626095763633; Mon, 12 Jul 2021 06:16:03 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id m6sm17321269wrw.9.2021.07.12.06.16.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:16:03 -0700 (PDT) From: luca.boccassi@gmail.com To: =?UTF-8?q?Juraj=20Linke=C5=A1?= Cc: Maxime Coquelin , dpdk stable Date: Mon, 12 Jul 2021 14:05:49 +0100 Message-Id: <20210712130551.2462159-114-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210712130551.2462159-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.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 20.11.3 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 20.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/09108e8931c95d990da9bb4055d21c1541a82951 Thanks. Luca Boccassi --- >From 09108e8931c95d990da9bb4055d21c1541a82951 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 eaed46373d..59073fa336 100644 --- a/drivers/net/virtio/meson.build +++ b/drivers/net/virtio/meson.build @@ -31,7 +31,7 @@ if arch_subdir == 'x86' sources += files('virtio_rxtx_simple_sse.c') elif arch_subdir == 'ppc' 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.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-12 13:41:42.504941261 +0100 +++ 0114-net-virtio-fix-aarch32-build.patch 2021-07-12 13:41:36.926131693 +0100 @@ -1 +1 @@ -From 143b6270b05cf6693f47f692bf890f7f16f9bfd1 Mon Sep 17 00:00:00 2001 +From 09108e8931c95d990da9bb4055d21c1541a82951 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 eaed46373d..59073fa336 100644 @@ -30,2 +31,2 @@ -@@ -41,7 +41,7 @@ if arch_subdir == 'x86' - sources += files('virtio_rxtx_simple_sse.c') +@@ -31,7 +31,7 @@ if arch_subdir == 'x86' + sources += files('virtio_rxtx_simple_sse.c') @@ -33 +34 @@ - sources += files('virtio_rxtx_simple_altivec.c') + 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 @@ +