drop queue-6.1/s390-pci-fix-stale-function-handles-in-error-handlin.patch

It's been dropped from 6.6 so drop it from here

diff --git a/queue-6.1/s390-pci-fix-stale-function-handles-in-error-handlin.patch b/queue-6.1/s390-pci-fix-stale-function-handles-in-error-handlin.patch
deleted file mode 100644 (file)
index 4da7ff0..0000000
--- a/queue-6.1/s390-pci-fix-stale-function-handles-in-error-handlin.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From a7fafb96b43bba18087a6ae3998e0da6d1fee109 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 7 Jul 2025 04:35:20 -0400
-Subject: s390/pci: Fix stale function handles in error handling
-
-From: Niklas Schnelle <schnelle@linux.ibm.com>
-
-[ Upstream commit 45537926dd2aaa9190ac0fac5a0fbeefcadfea95 ]
-
-The error event information for PCI error events contains a function
-handle for the respective function. This handle is generally captured at
-the time the error event was recorded. Due to delays in processing or
-cascading issues, it may happen that during firmware recovery multiple
-events are generated. When processing these events in order Linux may
-already have recovered an affected function making the event information
-stale. Fix this by doing an unconditional CLP List PCI function
-retrieving the current function handle with the zdev->state_lock held
-and ignoring the event if its function handle is stale.
-
-Cc: stable@vger.kernel.org
-Fixes: 4cdf2f4e24ff ("s390/pci: implement minimal PCI error recovery")
-Reviewed-by: Julian Ruess <julianr@linux.ibm.com>
-Reviewed-by: Gerd Bayer <gbayer@linux.ibm.com>
-Reviewed-by: Farhan Ali <alifm@linux.ibm.com>
-Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
-Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/s390/pci/pci_event.c | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/arch/s390/pci/pci_event.c b/arch/s390/pci/pci_event.c
-index d969f36bf186f..dc512c8f82324 100644
---- a/arch/s390/pci/pci_event.c
-+++ b/arch/s390/pci/pci_event.c
-@@ -257,6 +257,8 @@ static void __zpci_event_error(struct zpci_ccdf_err *ccdf)
-       struct zpci_dev *zdev = get_zdev_by_fid(ccdf->fid);
-       struct pci_dev *pdev = NULL;
-       pci_ers_result_t ers_res;
-+      u32 fh = 0;
-+      int rc;
- 
-       zpci_dbg(3, "err fid:%x, fh:%x, pec:%x\n",
-                ccdf->fid, ccdf->fh, ccdf->pec);
-@@ -264,9 +266,23 @@ static void __zpci_event_error(struct zpci_ccdf_err *ccdf)
-       zpci_err_hex(ccdf, sizeof(*ccdf));
- 
-       if (zdev) {
-+              mutex_lock(&zdev->state_lock);
-+              rc = clp_refresh_fh(zdev->fid, &fh);
-+              if (rc) {
-+                      mutex_unlock(&zdev->state_lock);
-+                      goto no_pdev;
-+              }
-+              if (!fh || ccdf->fh != fh) {
-+                      /* Ignore events with stale handles */
-+                      zpci_dbg(3, "err fid:%x, fh:%x (stale %x)\n",
-+                               ccdf->fid, fh, ccdf->fh);
-+                      mutex_unlock(&zdev->state_lock);
-+                      goto no_pdev;
-+              }
-               zpci_update_fh(zdev, ccdf->fh);
-               if (zdev->zbus->bus)
-                       pdev = pci_get_slot(zdev->zbus->bus, zdev->devfn);
-+              mutex_unlock(&zdev->state_lock);
-       }
- 
-       pr_err("%s: Event 0x%x reports an error for PCI function 0x%x\n",
--- 
-2.39.5
-

diff --git a/queue-6.1/series b/queue-6.1/series
index 46d6c3c29663491a846e6762fa2a15baef107ee2..6fa2a8d4f320e64e372f39bb97ad919807401648 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -57,7 +57,6 @@ acpica-refuse-to-evaluate-a-method-if-arguments-are-.patch
 mtd-spinand-fix-memory-leak-of-ecc-engine-conf.patch
 rcu-return-early-if-callback-is-not-specified.patch
 virtio-net-ensure-the-received-length-does-not-excee.patch
-s390-pci-fix-stale-function-handles-in-error-handlin.patch
 drm-v3d-disable-interrupts-before-resetting-the-gpu.patch
 nfsv4-flexfiles-fix-handling-of-nfs-level-errors-in-.patch
 btrfs-use-btrfs_record_snapshot_destroy-during-rmdir.patch