From 0c55f278d1a5771207d87ce941a1641121fd43da Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 19 Dec 2019 11:44:39 +0100 Subject: [PATCH] drop pci-switchtec-read-all-64-bits-of-part_event_bitmap.patch from 4.19 and 4.14 --- ...ead-all-64-bits-of-part_event_bitmap.patch | 36 ------------------- queue-4.14/series | 1 - ...ead-all-64-bits-of-part_event_bitmap.patch | 36 ------------------- queue-4.19/series | 1 - 4 files changed, 74 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 1e38af49a39..00000000000 --- a/queue-4.14/pci-switchtec-read-all-64-bits-of-part_event_bitmap.patch +++ /dev/null @@ -1,36 +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 = ioread64(&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 abd4e4246cf..be12d8af755 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -11,7 +11,6 @@ tcp-protect-accesses-to-.ts_recent_stamp-with-read-write-_once.patch inet-protect-against-too-small-mtu-values.patch nvme-host-core-fix-precedence-of-ternary-operator.patch revert-regulator-defer-init-completion-for-a-while-after-late_initcall.patch -pci-switchtec-read-all-64-bits-of-part_event_bitmap.patch pci-pm-always-return-devices-to-d0-when-thawing.patch pci-fix-intel-acs-quirk-updcr-register-address.patch pci-msi-fix-incorrect-msi-x-masking-on-resume.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 424dd5dfb03..00000000000 --- a/queue-4.19/pci-switchtec-read-all-64-bits-of-part_event_bitmap.patch +++ /dev/null @@ -1,36 +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 = ioread64(&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 306c8dda946..ae1869c8dec 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -15,7 +15,6 @@ tcp-protect-accesses-to-.ts_recent_stamp-with-read-write-_once.patch revert-arm64-preempt-fix-big-endian-when-checking-preempt-count-in-assembly.patch mmc-block-make-card_busy_detect-a-bit-more-generic.patch mmc-block-add-cmd13-polling-for-mmc-ioctls-with-r1b-response.patch -pci-switchtec-read-all-64-bits-of-part_event_bitmap.patch pci-pm-always-return-devices-to-d0-when-thawing.patch pci-pciehp-avoid-returning-prematurely-from-sysfs-requests.patch pci-fix-intel-acs-quirk-updcr-register-address.patch -- 2.47.3