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 699BFA0093 for ; Thu, 28 May 2020 18:24:32 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 615091D996; Thu, 28 May 2020 18:24:32 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 2477A1D996 for ; Thu, 28 May 2020 18:24:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=44yuVVi93v4e5g04gYf+iHct+LW28Bz+5C9uHNlwzYE=; b=b4RpioWNNSR8zt9R8nSVQbsZYDX/xmouhr5p1wiZoBoS4KQtg4/jHGX2SY1DNvZ2LRN6fw MUR/xUlfDyODca4GJUiE+f+eI0JYUeF1NTrNgtrTQLZ9PTn4pZm2wPOOJ/MVGYxtIvSACf ci39zv5bZLsrDK3wc7XnF60AL9AhtBA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-171-YkT6R7odPk6ziEddMoULow-1; Thu, 28 May 2020 12:24:26 -0400 X-MC-Unique: YkT6R7odPk6ziEddMoULow-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 91719100D11F; Thu, 28 May 2020 16:24:25 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8119D60C05; Thu, 28 May 2020 16:24:24 +0000 (UTC) From: Kevin Traynor To: David Christensen Cc: David Wilder , David Marchand , dpdk stable Date: Thu, 28 May 2020 17:21:55 +0100 Message-Id: <20200528162322.7863-8-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'pci: fix build on ppc' has been queued to LTS release 18.11.9 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 LTS release 18.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/03/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/4422fd3200bbcdda4ab27afb39d5d410391bbf2a Thanks. Kevin. --- >From 4422fd3200bbcdda4ab27afb39d5d410391bbf2a 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 55d3abf9fe..1fddde60a5 100644 --- a/drivers/bus/ifpga/ifpga_bus.c +++ b/drivers/bus/ifpga/ifpga_bus.c @@ -25,4 +25,5 @@ #include #include +#include #include "rte_rawdev.h" diff --git a/lib/librte_pci/rte_pci.c b/lib/librte_pci/rte_pci.c index f400178bb6..a13aed9856 100644 --- a/lib/librte_pci/rte_pci.c +++ b/lib/librte_pci/rte_pci.c @@ -21,4 +21,5 @@ #include #include +#include #include "rte_pci.h" -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:12:59.591505883 +0100 +++ 0008-pci-fix-build-on-ppc.patch 2020-05-28 17:12:59.032557962 +0100 @@ -1 +1 @@ -From 61669ecb921fff821db11d81557fa0449a7eb79c Mon Sep 17 00:00:00 2001 +From 4422fd3200bbcdda4ab27afb39d5d410391bbf2a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 61669ecb921fff821db11d81557fa0449a7eb79c ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -29 +30 @@ -index dfd6b1fba9..addbc3e86b 100644 +index 55d3abf9fe..1fddde60a5 100644 @@ -39 +40 @@ -index a753cf3eca..d1ab6b414d 100644 +index f400178bb6..a13aed9856 100644