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 1CA0EA0C4C 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 1398D4069D; Mon, 12 Jul 2021 15:16:05 +0200 (CEST) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mails.dpdk.org (Postfix) with ESMTP id BD70E4069D for ; Mon, 12 Jul 2021 15:16:02 +0200 (CEST) Received: by mail-wr1-f51.google.com with SMTP id g16so15673549wrw.5 for ; Mon, 12 Jul 2021 06:16:02 -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=S4/o3Pvshj6vFdqrMdDBzlK2oE3HZvDU4Lpa1ej3Fs0=; b=fCblWV8VhEfHA584ZiV3ZznUSUvLHu+4+68PfqJqpfGSDuTOr5LDXMwag+aGjBy5/T Of/LsMc9rjHMfh635ZLBsYdQctnXtTcF0E9Z4rVLUk88tPvmtFWa+yr87fwETmuTHJQ4 qyoMr4dkplxq9FfxnUwY6YK70qTNk+zeuW5dawUEYlnYEOo3pEUUHwuOwERzBZEA0BcO w2ztnl/aBGuGs8E2qHCIL6hP9w6vERCwOgrCBwBLnhWzBWxYAv42/WzbTtyzS6Y0MeZ2 ta6jlLEq5ZuyctBceYAZ+mdMdqFFbEfvyjkU/ZF7azP36h1IZs9qx/i+UMbMtrFrc+QY pY1A== 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=S4/o3Pvshj6vFdqrMdDBzlK2oE3HZvDU4Lpa1ej3Fs0=; b=iim6X44G8W4GPzjWxyACNvCoLVInFMI7jX3GCqCh7ty+HFoxhzsaADHLZwS7SRz38C iDoxXhYIlNINY6cYJQw7iH9++0lvMHpnjBM/TEcExkh5YlykFfltTwQ/zaD1IJ4R/x8/ RDodVJ4Tzu6ErOHkDg7pDcfoUQ9Kk+YWubF+xlwZl6K7OQ/WaQOwRQVutV5QtO1dWUMD GpwNE3Uzziir1WJX+OOkkph+n/l35/tI6czbz8gS6SNDWxZQMGgNdbLGEP1kah32o8wX 0BoSn1crSXMviXBR71MkZ8uX9gvs/n2o8O3pRZ/klRxqBvrm16VZe0F/tvy/JbinYARY ubFg== X-Gm-Message-State: AOAM530JlXsFd/6tZchvzBD9p7UGzrZHznRDNhpjuSe9YHsKJI2AVfkG /bUHEv5KqqIRnxdZNU8KbYE= X-Google-Smtp-Source: ABdhPJxkmLlMmErtYHh9/K9URvZ1+useoSQ8Jhkr7g6Bl/iaPHEm4NRYJW6U5SzW0n5+IRySTQsnmQ== X-Received: by 2002:a5d:43cf:: with SMTP id v15mr39636111wrr.334.1626095762531; Mon, 12 Jul 2021 06:16:02 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id f26sm6491394wmc.29.2021.07.12.06.16.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:16:02 -0700 (PDT) From: luca.boccassi@gmail.com To: Ruifeng Wang Cc: Lance Richardson , dpdk stable Date: Mon, 12 Jul 2021 14:05:48 +0100 Message-Id: <20210712130551.2462159-113-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-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: 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/0c550171b000ca79830eb3309705cc125fefc266 Thanks. Luca Boccassi --- >From 0c550171b000ca79830eb3309705cc125fefc266 Mon Sep 17 00:00:00 2001 From: Ruifeng Wang Date: Wed, 7 Jul 2021 15:25:38 +0200 Subject: [PATCH] net/bnxt: fix aarch32 build [ upstream commit 746d6f83888cfd1bd3c2a1fc849372424b9aa815 ] 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: 398358341419 ("net/bnxt: support NEON") Signed-off-by: Ruifeng Wang Reviewed-by: Lance Richardson --- drivers/net/bnxt/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/bnxt/meson.build b/drivers/net/bnxt/meson.build index 2896337b5d..a2fd494dac 100644 --- a/drivers/net/bnxt/meson.build +++ b/drivers/net/bnxt/meson.build @@ -74,6 +74,6 @@ sources = files('bnxt_cpr.c', if arch_subdir == 'x86' sources += files('bnxt_rxtx_vec_sse.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('bnxt_rxtx_vec_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.459857183 +0100 +++ 0113-net-bnxt-fix-aarch32-build.patch 2021-07-12 13:41:36.926131693 +0100 @@ -1 +1 @@ -From 746d6f83888cfd1bd3c2a1fc849372424b9aa815 Mon Sep 17 00:00:00 2001 +From 0c550171b000ca79830eb3309705cc125fefc266 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 746d6f83888cfd1bd3c2a1fc849372424b9aa815 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 12ecd37d54..81cbe0381f 100644 +index 2896337b5d..a2fd494dac 100644 @@ -27,4 +28,4 @@ -@@ -66,6 +66,6 @@ if arch_subdir == 'x86' - c_args: [cflags, '-mavx2']) - objs += bnxt_avx2_lib.extract_objects('bnxt_rxtx_vec_avx2.c') - endif +@@ -74,6 +74,6 @@ sources = files('bnxt_cpr.c', + + if arch_subdir == 'x86' + sources += files('bnxt_rxtx_vec_sse.c') @@ -33 +34 @@ - sources += files('bnxt_rxtx_vec_neon.c') + sources += files('bnxt_rxtx_vec_neon.c')