[dpdk-stable] patch 'bus/ifpga: fix forcing optional devargs' has been queued to LTS release 18.11.1

[Kevin Traynor]

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 <andy.pei at intel.com>
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 <andy.pei at intel.com>
Acked-by: Rosen Xu <rosen.xu at intel.com>
---
 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 <andy.pei at intel.com>
 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 at dpdk.org
 
 Signed-off-by: Andy Pei <andy.pei at intel.com>
 Acked-by: Rosen Xu <rosen.xu at intel.com>