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 A7FD9A0093 for ; Tue, 19 May 2020 14:58:56 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9F8841D5DE; Tue, 19 May 2020 14:58:56 +0200 (CEST) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id CFA181D61F for ; Tue, 19 May 2020 14:58:54 +0200 (CEST) Received: by mail-wr1-f67.google.com with SMTP id l17so15814035wrr.4 for ; Tue, 19 May 2020 05:58:54 -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=ASW0C46AgFUB0X446mpFuvkb45/Lj8nqo40vuYoqBzI=; b=oNmzdZ+FdoTLcF2ADwmeZdEt/BSfXKrxld63kQLDk3h67RNX/SrNJoG+GCQUXfxTyy KI6NLvKxJB0n2ZJRXWE/QqCkcdBoN/zvxGbSC+a1Tn0lIfDu1WqMgw1DEsXG5DXW/ZQI 7OA7A+7kBcJmx6OpHYborkqnwP8YOYBbCwUY07dhG98AeNLfScxj//85iRJosSp71/V4 ASSIeraGEzQjuBQHNhve+677wuOqbA/p++9vob2iNtlNoYNLbYNO51ZXt/RHV/iKiVw5 LefRzodPKmKuNmkqocOierE8kByp6jVnqFbSliEKyiSMKbMN3BlLbSU/F8p06Ek8VlSF gljw== 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=ASW0C46AgFUB0X446mpFuvkb45/Lj8nqo40vuYoqBzI=; b=X0+Ytdq69f0Drc1WrQeb+g3SBErhiY7n/pRJYY0wn1gAgysOXekoMpwgqgIRjI7s+q QtReRQxa3Ri8gY8ZSSG0JMeoElOMAgtrEWGbVEXPYUKpTrLUlTEOKImLwfw0knvXfyb1 g4uWMN+uetQPTZ+qMly9WB8YxmHIw0rBA5eMmZFbH7JkCTu5fE1GGRnamS9YXE+7eNtl 1uWQYe5W53Ze2oVsGoItLUheCrqV4F4f8n/TCwo+mmP2VpNNfjw23Iscz7s8Iabik+fC SyTf/Ozbkbp6qmDRZ6iq0lZ1c68VmbanZt+TyliVYOWIj8nKrHui1Z87s/F27Ex8fmTO E38Q== X-Gm-Message-State: AOAM531s649afZfnSvuFJTQquwkcZmNZEeMNPYParKb8qca6AsJ9gtbC 2+5v+41LU3J518jLaQKFP0w= X-Google-Smtp-Source: ABdhPJxuh8SPI2rBBaIdZx+mOOk+40VyMpTvTDF8S35ucw+93hQtoiQCkSQIApa7+bbrSniv0qXDmw== X-Received: by 2002:adf:f4c4:: with SMTP id h4mr26207650wrp.142.1589893134580; Tue, 19 May 2020 05:58:54 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id h137sm4766211wme.0.2020.05.19.05.58.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 05:58:54 -0700 (PDT) From: luca.boccassi@gmail.com To: David Christensen Cc: David Wilder , David Marchand , dpdk stable Date: Tue, 19 May 2020 13:53:26 +0100 Message-Id: <20200519125804.104349-16-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519125804.104349-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'pci: fix build on ppc' has been queued to stable release 19.11.3 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 stable release 19.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 05/21/20. 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. Thanks. Luca Boccassi --- >From 3262e4181cff59157e370231b9d25fe9e5689592 Mon Sep 17 00:00:00 2001 From: David Christensen Date: Mon, 16 Mar 2020 13:47:49 -0700 Subject: [PATCH] pci: fix build on ppc [ upstream commit 61669ecb921fff821db11d81557fa0449a7eb79c ] The include file rte_debug.h is pulled into x86 builds through the following callchain: lib/librte_eal/common/include/generic/rte_cycles.h:17, lib/librte_eal/common/include/arch/x86/rte_cycles.h:13, lib/librte_eal/common/include/arch/x86/rte_spinlock.h:18, lib/librte_eal/common/include/arch/x86/rte_rwlock.h:13, The PPC specific version of the same callchain does not include rte_debug.h. Add rte_debug.h back into the C files that require it. Fixes: 0dcba5256287 ("pci: remove unneeded includes in public header file") Signed-off-by: David Christensen Tested-by: David Wilder Acked-by: David Marchand --- drivers/bus/ifpga/ifpga_bus.c | 1 + lib/librte_pci/rte_pci.c | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/bus/ifpga/ifpga_bus.c b/drivers/bus/ifpga/ifpga_bus.c index dfd6b1fba9..addbc3e86b 100644 --- a/drivers/bus/ifpga/ifpga_bus.c +++ b/drivers/bus/ifpga/ifpga_bus.c @@ -24,6 +24,7 @@ #include #include #include +#include #include "rte_rawdev.h" #include "rte_rawdev_pmd.h" diff --git a/lib/librte_pci/rte_pci.c b/lib/librte_pci/rte_pci.c index a753cf3eca..d1ab6b414d 100644 --- a/lib/librte_pci/rte_pci.c +++ b/lib/librte_pci/rte_pci.c @@ -20,6 +20,7 @@ #include #include #include +#include #include "rte_pci.h" -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 13:56:19.455379016 +0100 +++ 0016-pci-fix-build-on-ppc.patch 2020-05-19 13:56:18.179501099 +0100 @@ -1,8 +1,10 @@ -From 61669ecb921fff821db11d81557fa0449a7eb79c Mon Sep 17 00:00:00 2001 +From 3262e4181cff59157e370231b9d25fe9e5689592 Mon Sep 17 00:00:00 2001 From: David Christensen Date: Mon, 16 Mar 2020 13:47:49 -0700 Subject: [PATCH] pci: fix build on ppc +[ upstream commit 61669ecb921fff821db11d81557fa0449a7eb79c ] + The include file rte_debug.h is pulled into x86 builds through the following callchain: @@ -15,7 +17,6 @@ rte_debug.h. Add rte_debug.h back into the C files that require it. Fixes: 0dcba5256287 ("pci: remove unneeded includes in public header file") -Cc: stable@dpdk.org Signed-off-by: David Christensen Tested-by: David Wilder