I was able to apply the patches, but only in the order:
1) apply 0001-s390-pci-Recover-handle-in-clp_set_pci_fn.patch (based on
17cdec960cf7)
2) cherry-pick 576c75e36c68
However, the test compile (on focal, but that shouldn't matter) failed:
make[2]: Leaving directory
'/home/ubuntu/bionic-lp1870320/debian/build/build-generic'
make[1]: *** [Makefile:146: sub-make] Error 2
make[1]: Leaving directory '/home/ubuntu/bionic-lp1870320'
make: *** [debian/rules.d/2-binary-arch.mk:50:
/home/ubuntu/bionic-lp1870320/debian/stamps/stamp-build-generic] Error 2
ubuntu@s1lp15:~/bionic-lp1870320$
due to:
...
CC [M] fs/afs/inode.o
/home/ubuntu/bionic-lp1870320/arch/s390/pci/pci_clp.c: In function
‘clp_disable_fh’:
/home/ubuntu/bionic-lp1870320/arch/s390/pci/pci_clp.c:295:6: warning: unused
variable ‘fh’ [-Wunused-variable]
295 | u32 fh = zdev->fh;
| ^~
CC crypto/lzo.o
CC security/keys/request_key.o
CC arch/s390/pci/pci_sysfs.o
CC security/smack/smack_lsm.o
CC kernel/power/wakelock.o
CC [M] fs/afs/main.o
CC security/selinux/hooks.o
/home/ubuntu/bionic-lp1870320/arch/s390/pci/pci_sysfs.c: In function
‘recover_store’:
/home/ubuntu/bionic-lp1870320/arch/s390/pci/pci_sysfs.c:73:6: error: implicit
declaration of function ‘pci_dev_is_added’; did you mean ‘pci_device_add’?
[-Werror=implicit-function-declaration]
73 | if (pci_dev_is_added(pdev)) {
| ^~~~~~~~~~~~~~~~
| pci_device_add
CC crypto/rng.o
cc1: some warnings being treated as errors
...
--
You received this bug notification because you are a member of Kernel
Packages, which is subscribed to linux in Ubuntu.
https://bugs.launchpad.net/bugs/1870320
Title:
[UBUNTU 18.04] zpcictl --reset - contribution for kernel
Status in Ubuntu on IBM z Systems:
Confirmed
Status in linux package in Ubuntu:
Fix Released
Status in linux source package in Bionic:
Confirmed
Status in linux source package in Eoan:
New
Status in linux source package in Focal:
Fix Released
Status in linux source package in Groovy:
Fix Released
Bug description:
This Bug tracks the necessary backport for the Linux Kernel
to enable proper reset/recovery of PCI Functions in the error state.
There is a related fix to s390-tools but the relevant zpcictl command
is not part of Ubuntu 18.04
Upstream this includes the following commits:
In the Kernel:
17cdec960cf776b20b1fb08c622221babe591d51 s390/pci: Recover handle in
clp_set_pci_fn()
Backport patch attached.
576c75e36c689bec6a940e807bae27291ab0c0de s390/pci: Fix possible deadlock in
recover_store()
applies cleanly but for the second a small backport change is necessary.
These fixes are already in 20.04 but need also be applied to 18.04.
To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu-z-systems/+bug/1870320/+subscriptions
--
Mailing list: https://launchpad.net/~kernel-packages
Post to : kernel-packages@lists.launchpad.net
Unsubscribe : https://launchpad.net/~kernel-packages
More help : https://help.launchpad.net/ListHelp
