Drop pci-switchtec-read-all-64-bits-of-part_event_bitmap.patch

Breaks build on i386.

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.14/pci-switchtec-read-all-64-bits-of-part_event_bitmap.patch b/queue-4.14/pci-switchtec-read-all-64-bits-of-part_event_bitmap.patch
deleted file mode 100644 (file)
index a50e94b..0000000
--- a/queue-4.14/pci-switchtec-read-all-64-bits-of-part_event_bitmap.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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 |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/pci/switch/switchtec.c
-+++ b/drivers/pci/switch/switchtec.c
-@@ -898,7 +898,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.14/series b/queue-4.14/series
index 6b9ab2564bcca3bf6e5e04aec228698da3830eb0..8272e7f51bf1865ad19832f357be71868bc352f7 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -60,7 +60,6 @@ bonding-fix-active-backup-transition-after-link-fail.patch
 perf-strbuf-remove-redundant-va_end-in-strbuf_addv.patch
 make-filldir-verify-the-directory-entry-filename-is-valid.patch
 filldir-remove-warn_on_once-for-bad-directory-entries.patch
-pci-switchtec-read-all-64-bits-of-part_event_bitmap.patch
 netfilter-ebtables-compat-reject-all-padding-in-matches-watchers.patch
 6pack-mkiss-fix-possible-deadlock.patch
 netfilter-bridge-make-sure-to-pull-arp-header-in-br_nf_forward_arp.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
deleted file mode 100644 (file)
index 1314f86..0000000
--- a/queue-4.19/pci-switchtec-read-all-64-bits-of-part_event_bitmap.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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 |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/pci/switch/switchtec.c
-+++ b/drivers/pci/switch/switchtec.c
-@@ -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 4337ae463123992512649347eac2348c6191dac1..d7a6eb155d0dbe8cab6790b0284e3908c1ac0949 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -79,7 +79,6 @@ bonding-fix-active-backup-transition-after-link-fail.patch
 perf-strbuf-remove-redundant-va_end-in-strbuf_addv.patch
 make-filldir-verify-the-directory-entry-filename-is-valid.patch
 filldir-remove-warn_on_once-for-bad-directory-entries.patch
-pci-switchtec-read-all-64-bits-of-part_event_bitmap.patch
 netfilter-ebtables-compat-reject-all-padding-in-matches-watchers.patch
 6pack-mkiss-fix-possible-deadlock.patch
 netfilter-bridge-make-sure-to-pull-arp-header-in-br_nf_forward_arp.patch