4.19-stable patches

added patches:
	pci-switchtec-read-all-64-bits-of-part_event_bitmap.patch

diff --git a/queue-4.19/pci-switchtec-read-all-64-bits-of-part_event_bitmap.patch b/queue-4.19/pci-switchtec-read-all-64-bits-of-part_event_bitmap.patch
new file mode 100644 (file)
index 0000000..776b52c
--- /dev/null
+++ b/queue-4.19/pci-switchtec-read-all-64-bits-of-part_event_bitmap.patch
@@ -0,0 +1,45 @@
+From 6acdf7e19b37cb3a9258603d0eab315079c19c5e Mon Sep 17 00:00:00 2001
+From: Logan Gunthorpe <logang@deltatee.com>
+Date: Tue, 10 Sep 2019 13:58:33 -0600
+Subject: PCI/switchtec: Read all 64 bits of part_event_bitmap
+
+From: Logan Gunthorpe <logang@deltatee.com>
+
+commit 6acdf7e19b37cb3a9258603d0eab315079c19c5e upstream.
+
+The part_event_bitmap register is 64 bits wide, so read it with ioread64()
+instead of the 32-bit ioread32().
+
+Fixes: 52eabba5bcdb ("switchtec: Add IOCTLs to the Switchtec driver")
+Link: https://lore.kernel.org/r/20190910195833.3891-1-logang@deltatee.com
+Reported-by: Doug Meyer <dmeyer@gigaio.com>
+Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
+Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
+Cc: stable@vger.kernel.org     # v4.12+
+Cc: Kelvin Cao <Kelvin.Cao@microchip.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/pci/switch/switchtec.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/pci/switch/switchtec.c
++++ b/drivers/pci/switch/switchtec.c
+@@ -13,7 +13,7 @@
+ #include <linux/uaccess.h>
+ #include <linux/poll.h>
+ #include <linux/wait.h>
+-
++#include <linux/io-64-nonatomic-lo-hi.h>
+ #include <linux/nospec.h>
+ 
+ MODULE_DESCRIPTION("Microsemi Switchtec(tm) PCIe Management Driver");
+@@ -633,7 +633,7 @@ static int ioctl_event_summary(struct sw
+       u32 reg;
+ 
+       s.global = ioread32(&stdev->mmio_sw_event->global_summary);
+-      s.part_bitmap = ioread32(&stdev->mmio_sw_event->part_event_bitmap);
++      s.part_bitmap = readq(&stdev->mmio_sw_event->part_event_bitmap);
+       s.local_part = ioread32(&stdev->mmio_part_cfg->part_event_summary);
+ 
+       for (i = 0; i < stdev->partition_count; i++) {

diff --git a/queue-4.19/series b/queue-4.19/series
index 461a2afdcb97354b8d355b421cffd715c64708ed..03432a2b23c2a40d071b6192862cb11f9293f59e 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -61,3 +61,4 @@ powerpc-vcpu-assume-dedicated-processors-as-non-preempt.patch
 powerpc-spinlocks-include-correct-header-for-static-key.patch
 cpufreq-imx6q-read-ocotp-through-nvmem-for-imx6ul-imx6ull.patch
 arm-dts-imx6ul-use-nvmem-cells-for-cpu-speed-grading.patch
+pci-switchtec-read-all-64-bits-of-part_event_bitmap.patch