From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 4BE6E1B53B for ; Thu, 7 Feb 2019 14:28:05 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2063DCDDD0; Thu, 7 Feb 2019 13:28:04 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.33.36.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7799E6BF29; Thu, 7 Feb 2019 13:28:02 +0000 (UTC) From: Kevin Traynor To: Andy Pei Cc: Rosen Xu , dpdk stable Date: Thu, 7 Feb 2019 13:25:41 +0000 Message-Id: <20190207132614.20538-35-ktraynor@redhat.com> In-Reply-To: <20190207132614.20538-1-ktraynor@redhat.com> References: <20190207132614.20538-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 07 Feb 2019 13:28:04 +0000 (UTC) Subject: [dpdk-stable] patch 'bus/ifpga: fix forcing optional devargs' has been queued to LTS release 18.11.1 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: , X-List-Received-Date: Thu, 07 Feb 2019 13:28:05 -0000 Hi, FYI, your patch has been queued to LTS release 18.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/14/19. 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. Kevin Traynor --- >>From d25eaae5ce2abd7dbd18c146c98e287eb313f3de Mon Sep 17 00:00:00 2001 From: Andy Pei Date: Fri, 18 Jan 2019 11:07:01 +0000 Subject: [PATCH] bus/ifpga: fix forcing optional devargs [ upstream commit 6fa4aa2b36459d6cba8c01a243a527ad12444247 ] Original driver requires users to input "afu_bts" args. But driver can also work without an explicit "afu_bts" args. Fixes: 05fa3d4a6539 ("bus/ifpga: add Intel FPGA bus library") Signed-off-by: Andy Pei Acked-by: Rosen Xu --- drivers/bus/ifpga/ifpga_bus.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/bus/ifpga/ifpga_bus.c b/drivers/bus/ifpga/ifpga_bus.c index 5f23ed8b4..e4b7b6f50 100644 --- a/drivers/bus/ifpga/ifpga_bus.c +++ b/drivers/bus/ifpga/ifpga_bus.c @@ -126,13 +126,11 @@ ifpga_scan_one(struct rte_rawdev *rawdev, goto end; } + afu_pr_conf.pr_enable = 1; } else { - IFPGA_BUS_ERR("arg %s is mandatory for ifpga bus", - IFPGA_AFU_BTS); - goto end; + afu_pr_conf.pr_enable = 0; } afu_pr_conf.afu_id.uuid.uuid_low = 0; afu_pr_conf.afu_id.uuid.uuid_high = 0; - afu_pr_conf.pr_enable = path?1:0; if (ifpga_find_afu_dev(rawdev, &afu_pr_conf.afu_id)) -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-02-07 13:19:56.360379275 +0000 +++ 0035-bus-ifpga-fix-forcing-optional-devargs.patch 2019-02-07 13:19:55.000000000 +0000 @@ -1,13 +1,14 @@ -From 6fa4aa2b36459d6cba8c01a243a527ad12444247 Mon Sep 17 00:00:00 2001 +From d25eaae5ce2abd7dbd18c146c98e287eb313f3de Mon Sep 17 00:00:00 2001 From: Andy Pei Date: Fri, 18 Jan 2019 11:07:01 +0000 Subject: [PATCH] bus/ifpga: fix forcing optional devargs +[ upstream commit 6fa4aa2b36459d6cba8c01a243a527ad12444247 ] + Original driver requires users to input "afu_bts" args. But driver can also work without an explicit "afu_bts" args. Fixes: 05fa3d4a6539 ("bus/ifpga: add Intel FPGA bus library") -Cc: stable@dpdk.org Signed-off-by: Andy Pei Acked-by: Rosen Xu