Hi Niklas,
I just checked on my local git clone of noble master-next:

$ git log --oneline --grep "s390/pci: Allow re-add of a reserved but not yet 
removed device"
1c9b1caef9db s390/pci: Allow re-add of a reserved but not yet removed device
$ git tag --contains 1c9b1caef9db
Ubuntu-6.8.0-64.67 <=====
Ubuntu-lowlatency-6.8.0-64.67.1
fheimes@T570:~/ubuntu-noble-master-next/noble-clean$ git show 1c9b1caef9db | 
grep -C 3 zpci_event_reappear
        zdev->state = ZPCI_FN_STATE_STANDBY;
 }
 
+static void zpci_event_reappear(struct zpci_dev *zdev)
+{
+       lockdep_assert_held(&zdev->state_lock);
+       /*
--
                        }
                } else {
+                       if (zdev->state == ZPCI_FN_STATE_RESERVED)
+                               zpci_event_reappear(zdev);
                        /* the configuration request may be stale */
-                       if (zdev->state != ZPCI_FN_STATE_STANDBY)
+                       else if (zdev->state != ZPCI_FN_STATE_STANDBY)
--
                        }
                } else {
+                       if (zdev->state == ZPCI_FN_STATE_RESERVED)
+                               zpci_event_reappear(zdev);
                        zpci_update_fh(zdev, ccdf->fh);
                }
                break;
fheimes@T570:~/ubuntu-noble-master-next/noble-clean$ rmadison 
--suite=noble,noble-proposed --arch=s390x linux-generic
 linux-generic | 6.8.0-31.31 | noble          | s390x
 linux-generic | 6.8.0-64.67 | noble-proposed | s390x  <=====

So the code is included in: 6.8.0-64.67

On the git web interface I think it's this link:
https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/noble/log/?h=master-next&qt=grep&q=s390%2Fpci%3A+Allow+re-add+of+a+reserved+but+not+yet+removed+device
where this is referenced:
https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/noble/commit/?h=master-next&id=1c9b1caef9db383b587a19df8c6dcd14eb5f3af2

(so using normal master-next (master-next):
https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/noble/log/?h=master-next
instead of:
master-next--2025.06.16-2--auto )

-- 
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/2114174

Title:
  [UBUNTU 24.04] s390/pci: Fix immediate re-add of PCI function after
  remove

To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu-z-systems/+bug/2114174/+subscriptions


-- 
ubuntu-bugs mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs

Reply via email to