4.14-stable patches

added patches:
	coresight-do-not-use-the-bit-macro-in-the-uapi-header.patch
	misc-pci_endpoint_test-fix-to-support-10-pci-endpoint-test-devices.patch

diff --git a/queue-4.14/coresight-do-not-use-the-bit-macro-in-the-uapi-header.patch b/queue-4.14/coresight-do-not-use-the-bit-macro-in-the-uapi-header.patch
new file mode 100644 (file)
index 0000000..5dc79dc
--- /dev/null
+++ b/queue-4.14/coresight-do-not-use-the-bit-macro-in-the-uapi-header.patch
@@ -0,0 +1,39 @@
+From 9b6eaaf3db5e5888df7bca7fed7752a90f7fd871 Mon Sep 17 00:00:00 2001
+From: Eugene Syromiatnikov <esyr@redhat.com>
+Date: Tue, 24 Mar 2020 05:22:13 +0100
+Subject: coresight: do not use the BIT() macro in the UAPI header
+
+From: Eugene Syromiatnikov <esyr@redhat.com>
+
+commit 9b6eaaf3db5e5888df7bca7fed7752a90f7fd871 upstream.
+
+The BIT() macro definition is not available for the UAPI headers
+(moreover, it can be defined differently in the user space); replace
+its usage with the _BITUL() macro that is defined in <linux/const.h>.
+
+Fixes: 237483aa5cf4 ("coresight: stm: adding driver for CoreSight STM component")
+Signed-off-by: Eugene Syromiatnikov <esyr@redhat.com>
+Cc: stable <stable@vger.kernel.org>
+Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
+Link: https://lore.kernel.org/r/20200324042213.GA10452@asgard.redhat.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/uapi/linux/coresight-stm.h |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/include/uapi/linux/coresight-stm.h
++++ b/include/uapi/linux/coresight-stm.h
+@@ -2,8 +2,10 @@
+ #ifndef __UAPI_CORESIGHT_STM_H_
+ #define __UAPI_CORESIGHT_STM_H_
+ 
+-#define STM_FLAG_TIMESTAMPED   BIT(3)
+-#define STM_FLAG_GUARANTEED    BIT(7)
++#include <linux/const.h>
++
++#define STM_FLAG_TIMESTAMPED   _BITUL(3)
++#define STM_FLAG_GUARANTEED    _BITUL(7)
+ 
+ /*
+  * The CoreSight STM supports guaranteed and invariant timing

diff --git a/queue-4.14/misc-pci_endpoint_test-fix-to-support-10-pci-endpoint-test-devices.patch b/queue-4.14/misc-pci_endpoint_test-fix-to-support-10-pci-endpoint-test-devices.patch
new file mode 100644 (file)
index 0000000..8e687c4
--- /dev/null
+++ b/queue-4.14/misc-pci_endpoint_test-fix-to-support-10-pci-endpoint-test-devices.patch
@@ -0,0 +1,38 @@
+From 6b443e5c80b67a7b8a85b33d052d655ef9064e90 Mon Sep 17 00:00:00 2001
+From: Kishon Vijay Abraham I <kishon@ti.com>
+Date: Tue, 17 Mar 2020 15:31:57 +0530
+Subject: misc: pci_endpoint_test: Fix to support > 10 pci-endpoint-test devices
+
+From: Kishon Vijay Abraham I <kishon@ti.com>
+
+commit 6b443e5c80b67a7b8a85b33d052d655ef9064e90 upstream.
+
+Adding more than 10 pci-endpoint-test devices results in
+"kobject_add_internal failed for pci-endpoint-test.1 with -EEXIST, don't
+try to register things with the same name in the same directory". This
+is because commit 2c156ac71c6b ("misc: Add host side PCI driver for PCI
+test function device") limited the length of the "name" to 20 characters.
+Change the length of the name to 24 in order to support upto 10000
+pci-endpoint-test devices.
+
+Fixes: 2c156ac71c6b ("misc: Add host side PCI driver for PCI test function device")
+Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
+Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
+Cc: stable@vger.kernel.org # v4.14+
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/misc/pci_endpoint_test.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/misc/pci_endpoint_test.c
++++ b/drivers/misc/pci_endpoint_test.c
+@@ -466,7 +466,7 @@ static int pci_endpoint_test_probe(struc
+       int err;
+       int irq = 0;
+       int id;
+-      char name[20];
++      char name[24];
+       enum pci_barno bar;
+       void __iomem *base;
+       struct device *dev = &pdev->dev;

diff --git a/queue-4.14/series b/queue-4.14/series
index 3029bdba01bf6095c635930e50447167787beb9c..98ef2e62af3e3989312b3955fe009e5512467bf5 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -8,3 +8,5 @@ tools-power-turbostat-fix-gcc-build-warnings.patch
 drm-etnaviv-replace-mmu-flush-marker-with-flush-sequence.patch
 blk-mq-sync-the-update-nr_hw_queues-with-blk_mq_queue_tag_busy_iter.patch
 blk-mq-allow-blocking-queue-tag-iter-callbacks.patch
+misc-pci_endpoint_test-fix-to-support-10-pci-endpoint-test-devices.patch
+coresight-do-not-use-the-bit-macro-in-the-uapi-header.patch