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 ED6D3A0C4C for ; Mon, 12 Jul 2021 15:16:02 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E43594069D; Mon, 12 Jul 2021 15:16:02 +0200 (CEST) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mails.dpdk.org (Postfix) with ESMTP id C8D344069D for ; Mon, 12 Jul 2021 15:16:01 +0200 (CEST) Received: by mail-wm1-f51.google.com with SMTP id h18-20020a05600c3512b029020e4ceb9588so14452458wmq.5 for ; Mon, 12 Jul 2021 06:16:01 -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=NO7EQJDEh4BPggTFNOQNBessvtgBkWGNMpAotGKDWEw=; b=pvQ//AQCN1P2D2UoMFWwCr3sYyVlJ6l64uqU8ggphW51jWp+9RWlJjVowayYJIJ5TC FBbztVnnmD8uPEqZOBr3NV+8p9zUyF7vb6DFPy9SgfblrrC68PP3taLWFdokkkwCIpxw 47vNoqzVTg7dX+dAXHs2ud9QCNC7dYVb2n7AGos38ZZSyJRY0huWg/Xh+BNRsG2+X1N7 uvOapSBTE4ji5sR8upbqK6k7q0IvjxCw3WlMARxUyiWO8t+MfXkd7+w6BjeWB8kxXy1M kqBoegEW3J1a5xz/wgedQfDKjnvUSmqqqJqBrudelQfMpuanrosmrP8mz94sbgtNd8uu NCfQ== 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=NO7EQJDEh4BPggTFNOQNBessvtgBkWGNMpAotGKDWEw=; b=BNvDS4hZoE53NxzxaxCwurZfGXRqLSxEcVM7n54/k1J9lIPL8ZN10/2NpAlF5IK1mK +LHSBC4ScDlhS5HTzi8EpAZbMfjbPvzDsGh5iaW+R+Z6VA+rAtYVwfvQ0VaRE5mAUqqR oSQZ74+IYEk7tYPTRvyUzaKdFWlZ58THbROuzoboaDTIOVi4Op4lzXOwhEe39nhjL/O0 pwcZ94nZfb0Emvkvk+5hW3vH5Ng/H86tmDXVqm/dOnMKjZjWRn93qV1cGcroEVPQ4gAU MXoUStFHUlunJFph9RgkXRsrNdGpG9jMhiMEBN4ig/esjwsQvTpth6+JXCx8S+cj3HII 2ZdA== X-Gm-Message-State: AOAM530GwMS0jJNW9Ll6FapdzYXEw4q2toGERzvfOO1kI7eVRFx1UWgE M3BRljV5KB5iCmThV5D/kIY= X-Google-Smtp-Source: ABdhPJy1hmWaBogQcM9DWTLAEUddYnImq+43HnvcC+r1azD0xodQbFOHu+YNrjOXmIX/7XsFq6GFFA== X-Received: by 2002:a1c:f206:: with SMTP id s6mr14301020wmc.15.1626095761530; Mon, 12 Jul 2021 06:16:01 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id f2sm14358330wrq.69.2021.07.12.06.16.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:16:00 -0700 (PDT) From: luca.boccassi@gmail.com To: Ruifeng Wang Cc: dpdk stable Date: Mon, 12 Jul 2021 14:05:47 +0100 Message-Id: <20210712130551.2462159-112-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/sfc: 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/4fccdefbd82bbf9bf5f8952190347d7ba6ec97b0 Thanks. Luca Boccassi --- >From 4fccdefbd82bbf9bf5f8952190347d7ba6ec97b0 Mon Sep 17 00:00:00 2001 From: Ruifeng Wang Date: Wed, 7 Jul 2021 15:25:37 +0200 Subject: [PATCH] net/sfc: fix aarch32 build [ upstream commit a5f1b1e5153a4b061c538f74f1cebc01c91cff1a ] The sfc PMD was enabled for aarch32 which is 32-bit mode but has cpu_family set to aarch64. As sfc support only 64-bit system, it should be disabled for aarch32. Updated meson file to disable sfc for aarch32 build. Fixes: 141d2870675a ("net/sfc: support aarch64 architecture") Signed-off-by: Ruifeng Wang --- drivers/common/sfc_efx/meson.build | 2 +- drivers/net/sfc/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/common/sfc_efx/meson.build b/drivers/common/sfc_efx/meson.build index 6cb9f0737f..1e17f1fd29 100644 --- a/drivers/common/sfc_efx/meson.build +++ b/drivers/common/sfc_efx/meson.build @@ -5,7 +5,7 @@ # This software was jointly developed between OKTET Labs (under contract # for Solarflare) and Solarflare Communications, Inc. -if (arch_subdir != 'x86' or not dpdk_conf.get('RTE_ARCH_64')) and (arch_subdir != 'arm' or not host_machine.cpu_family().startswith('aarch64')) +if (arch_subdir != 'x86' and arch_subdir != 'arm') or (not dpdk_conf.get('RTE_ARCH_64')) build = false reason = 'only supported on x86_64 and aarch64' endif diff --git a/drivers/net/sfc/meson.build b/drivers/net/sfc/meson.build index be888bd87a..61535f8673 100644 --- a/drivers/net/sfc/meson.build +++ b/drivers/net/sfc/meson.build @@ -6,7 +6,7 @@ # This software was jointly developed between OKTET Labs (under contract # for Solarflare) and Solarflare Communications, Inc. -if (arch_subdir != 'x86' or not dpdk_conf.get('RTE_ARCH_64')) and (arch_subdir != 'arm' or not host_machine.cpu_family().startswith('aarch64')) +if (arch_subdir != 'x86' and arch_subdir != 'arm') or (not dpdk_conf.get('RTE_ARCH_64')) build = false reason = 'only supported on x86_64 and aarch64' endif -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-12 13:41:42.412539514 +0100 +++ 0112-net-sfc-fix-aarch32-build.patch 2021-07-12 13:41:36.926131693 +0100 @@ -1 +1 @@ -From a5f1b1e5153a4b061c538f74f1cebc01c91cff1a Mon Sep 17 00:00:00 2001 +From 4fccdefbd82bbf9bf5f8952190347d7ba6ec97b0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a5f1b1e5153a4b061c538f74f1cebc01c91cff1a ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index f42ccf609c..0cf0a23bf8 100644 +index 6cb9f0737f..1e17f1fd29 100644 @@ -25,3 +26,3 @@ -@@ -10,7 +10,7 @@ if is_windows - reason = 'not supported on Windows' - endif +@@ -5,7 +5,7 @@ + # This software was jointly developed between OKTET Labs (under contract + # for Solarflare) and Solarflare Communications, Inc. @@ -31,2 +32,2 @@ - build = false - reason = 'only supported on x86_64 and aarch64' + build = false + reason = 'only supported on x86_64 and aarch64' @@ -35 +36 @@ -index ccf5984d87..18e7edb568 100644 +index be888bd87a..61535f8673 100644 @@ -38,3 +39,3 @@ -@@ -12,7 +12,7 @@ if is_windows - subdir_done() - endif +@@ -6,7 +6,7 @@ + # This software was jointly developed between OKTET Labs (under contract + # for Solarflare) and Solarflare Communications, Inc. @@ -44,2 +45,2 @@ - build = false - reason = 'only supported on x86_64 and aarch64' + build = false + reason = 'only supported on x86_64 and aarch64'