From e30f6f3bf9def85d64d004a84bb3dce488ccd47f Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Thu, 2 Jan 2020 19:18:57 -0500 Subject: [PATCH] Drop pci-switchtec-read-all-64-bits-of-part_event_bitmap.patch Breaks build on i386. Signed-off-by: Sasha Levin --- ...ead-all-64-bits-of-part_event_bitmap.patch | 37 ------------------- queue-4.14/series | 1 - ...ead-all-64-bits-of-part_event_bitmap.patch | 37 ------------------- queue-4.19/series | 1 - 4 files changed, 76 deletions(-) delete mode 100644 queue-4.14/pci-switchtec-read-all-64-bits-of-part_event_bitmap.patch delete mode 100644 queue-4.19/pci-switchtec-read-all-64-bits-of-part_event_bitmap.patch 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 index a50e94bb2b2..00000000000 --- 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 -Date: Tue, 10 Sep 2019 13:58:33 -0600 -Subject: PCI/switchtec: Read all 64 bits of part_event_bitmap - -From: Logan Gunthorpe - -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 -Signed-off-by: Logan Gunthorpe -Signed-off-by: Bjorn Helgaas -Cc: stable@vger.kernel.org # v4.12+ -Cc: Kelvin Cao -Signed-off-by: Greg Kroah-Hartman - - ---- - 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 6b9ab2564bc..8272e7f51bf 100644 --- 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 index 1314f866e1f..00000000000 --- 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 -Date: Tue, 10 Sep 2019 13:58:33 -0600 -Subject: PCI/switchtec: Read all 64 bits of part_event_bitmap - -From: Logan Gunthorpe - -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 -Signed-off-by: Logan Gunthorpe -Signed-off-by: Bjorn Helgaas -Cc: stable@vger.kernel.org # v4.12+ -Cc: Kelvin Cao -Signed-off-by: Greg Kroah-Hartman - - ---- - 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 4337ae46312..d7a6eb155d0 100644 --- 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 -- 2.47.3