drop queue-5.10/s390-pci-cleanup-resources-only-if-necessary.patch

diff --git a/queue-5.10/s390-pci-cleanup-resources-only-if-necessary.patch b/queue-5.10/s390-pci-cleanup-resources-only-if-necessary.patch
deleted file mode 100644 (file)
index 647ca93..0000000
--- a/queue-5.10/s390-pci-cleanup-resources-only-if-necessary.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 02368b7cf6c7badefa13741aed7a8b91d9a11b19 Mon Sep 17 00:00:00 2001
-From: Niklas Schnelle <schnelle@linux.ibm.com>
-Date: Fri, 6 Aug 2021 10:28:40 +0200
-Subject: s390/pci: cleanup resources only if necessary
-
-From: Niklas Schnelle <schnelle@linux.ibm.com>
-
-commit 02368b7cf6c7badefa13741aed7a8b91d9a11b19 upstream.
-
-It's currently safe to call zpci_cleanup_bus_resources() even if the
-resources were never created but it makes no sense so check
-zdev->has_resources before we call zpci_cleanup_bus_resources() in
-zpci_release_device().
-
-Reviewed-by: Matthew Rosato <mjrosato@linux.ibm.com>
-Acked-by: Pierre Morel <pmorel@linux.ibm.com>
-Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
-Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/s390/pci/pci.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/arch/s390/pci/pci.c
-+++ b/arch/s390/pci/pci.c
-@@ -802,7 +802,8 @@ void zpci_release_device(struct kref *kr
-       case ZPCI_FN_STATE_STANDBY:
-               if (zdev->has_hp_slot)
-                       zpci_exit_slot(zdev);
--              zpci_cleanup_bus_resources(zdev);
-+              if (zdev->has_resources)
-+                      zpci_cleanup_bus_resources(zdev);
-               zpci_bus_device_unregister(zdev);
-               zpci_destroy_iommu(zdev);
-               fallthrough;

diff --git a/queue-5.10/s390-pci-fix-zpci_zdev_put-on-reserve.patch b/queue-5.10/s390-pci-fix-zpci_zdev_put-on-reserve.patch
index 180ff6373cf9838e9ec6edd4517ea0abc3e70a0a..ba4ba8730e5d09b90cbe0115d57c40d6d2e0b85e 100644 (file)
--- a/queue-5.10/s390-pci-fix-zpci_zdev_put-on-reserve.patch
+++ b/queue-5.10/s390-pci-fix-zpci_zdev_put-on-reserve.patch
@@ -116,10 +116,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +              zpci_dbg(3, "rsv fid:%x\n", zdev->fid);
 +              fallthrough;
 +      case ZPCI_FN_STATE_RESERVED:
-               if (zdev->has_resources)
-                       zpci_cleanup_bus_resources(zdev);
+               zpci_cleanup_bus_resources(zdev);
                zpci_bus_device_unregister(zdev);
-@@ -810,10 +849,6 @@ void zpci_release_device(struct kref *kr
+               zpci_destroy_iommu(zdev);
+@@ -809,10 +848,6 @@ void zpci_release_device(struct kref *kr
        default:
                break;
        }

diff --git a/queue-5.10/series b/queue-5.10/series
index 4cf32d4e66fc4e16e3bdbe4494ad4ea56a79866e..15fb160e11a13ded4768c0f09683dda2466c75f6 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -84,5 +84,4 @@ sched-scs-reset-the-shadow-stack-when-idle_task_exit.patch
 net-hns3-fix-for-miscalculation-of-rx-unused-desc.patch
 scsi-core-fix-shost-cmd_per_lun-calculation-in-scsi_add_host_with_dma.patch
 can-isotp-isotp_sendmsg-fix-tx-buffer-concurrent-access-in-isotp_sendmsg.patch
-s390-pci-cleanup-resources-only-if-necessary.patch
 s390-pci-fix-zpci_zdev_put-on-reserve.patch