[dpdk-stable] patch 'vdpa/ifc: fix build with recent kernels' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/30/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 b0cad9cfe65a03af49b7506a16127a8d5b24961e Mon Sep 17 00:00:00 2001
From: Maxime Coquelin <maxime.coquelin at redhat.com>
Date: Fri, 2 Oct 2020 09:54:00 +0200
Subject: [PATCH] vdpa/ifc: fix build with recent kernels

[ upstream commit 4e1b5092ad1ce3e3bd66eb20a9976d027e424b0a ]

VIRTIO_F_IOMMU_PLATFORM is now defined in recent kernel
headers, causing build issue.

Let's define it in the IFC vDPA driver only if it wasn't already.

Fixes: a3f8150eac6d ("net/ifcvf: add ifcvf vDPA driver")

Reported-by: Brandon Lo <blo at iol.unh.edu>
Signed-off-by: Maxime Coquelin <maxime.coquelin at redhat.com>
Acked-by: David Marchand <david.marchand at redhat.com>
---
 drivers/net/ifc/base/ifcvf.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/ifc/base/ifcvf.h b/drivers/net/ifc/base/ifcvf.h
index 9be2770fea..3f7497bd02 100644
--- a/drivers/net/ifc/base/ifcvf.h
+++ b/drivers/net/ifc/base/ifcvf.h
@@ -13,7 +13,10 @@
 #define IFCVF_SUBSYS_DEVICE_ID	0x001A
 
 #define IFCVF_MAX_QUEUES		1
+
+#ifndef VIRTIO_F_IOMMU_PLATFORM
 #define VIRTIO_F_IOMMU_PLATFORM		33
+#endif
 
 /* Common configuration */
 #define IFCVF_PCI_CAP_COMMON_CFG	1
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:14.858988377 +0000
+++ 0099-vdpa-ifc-fix-build-with-recent-kernels.patch	2020-10-28 10:35:11.652832202 +0000
@@ -1,27 +1,28 @@
-From 4e1b5092ad1ce3e3bd66eb20a9976d027e424b0a Mon Sep 17 00:00:00 2001
+From b0cad9cfe65a03af49b7506a16127a8d5b24961e Mon Sep 17 00:00:00 2001
 From: Maxime Coquelin <maxime.coquelin at redhat.com>
 Date: Fri, 2 Oct 2020 09:54:00 +0200
 Subject: [PATCH] vdpa/ifc: fix build with recent kernels
 
+[ upstream commit 4e1b5092ad1ce3e3bd66eb20a9976d027e424b0a ]
+
 VIRTIO_F_IOMMU_PLATFORM is now defined in recent kernel
 headers, causing build issue.
 
 Let's define it in the IFC vDPA driver only if it wasn't already.
 
 Fixes: a3f8150eac6d ("net/ifcvf: add ifcvf vDPA driver")
-Cc: stable at dpdk.org
 
 Reported-by: Brandon Lo <blo at iol.unh.edu>
 Signed-off-by: Maxime Coquelin <maxime.coquelin at redhat.com>
 Acked-by: David Marchand <david.marchand at redhat.com>
 ---
- drivers/vdpa/ifc/base/ifcvf.h | 3 +++
+ drivers/net/ifc/base/ifcvf.h | 3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/drivers/vdpa/ifc/base/ifcvf.h b/drivers/vdpa/ifc/base/ifcvf.h
-index a288ce57dc..573a35ffb4 100644
---- a/drivers/vdpa/ifc/base/ifcvf.h
-+++ b/drivers/vdpa/ifc/base/ifcvf.h
+diff --git a/drivers/net/ifc/base/ifcvf.h b/drivers/net/ifc/base/ifcvf.h
+index 9be2770fea..3f7497bd02 100644
+--- a/drivers/net/ifc/base/ifcvf.h
++++ b/drivers/net/ifc/base/ifcvf.h
 @@ -13,7 +13,10 @@
  #define IFCVF_SUBSYS_DEVICE_ID	0x001A