tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 's390-6.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull s390 updates from Alexander Gordeev:

- Fix a KVM crash on z12 and older machines caused by a wrong
assumption that Query AP Configuration Information is always
available.

- Lower severity of excessive Hypervisor filesystem error messages
when booting under KVM.

* tag 's390-6.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/ap: fix crash on older machines based on QCI info missing
s390/hypfs: avoid error message under KVM

Linus Torvalds cc1807b9 32dd68f1

+9 -2
+1 -1
arch/s390/hypfs/hypfs_diag.c
··· 437 437 int rc; 438 438 439 439 if (diag204_probe()) { 440 - pr_err("The hardware system does not support hypfs\n"); 440 + pr_info("The hardware system does not support hypfs\n"); 441 441 return -ENODATA; 442 442 } 443 443
+1 -1
arch/s390/hypfs/inode.c
··· 496 496 hypfs_vm_exit(); 497 497 fail_hypfs_diag_exit: 498 498 hypfs_diag_exit(); 499 + pr_err("Initialization of hypfs failed with rc=%i\n", rc); 499 500 fail_dbfs_exit: 500 501 hypfs_dbfs_exit(); 501 - pr_err("Initialization of hypfs failed with rc=%i\n", rc); 502 502 return rc; 503 503 } 504 504 device_initcall(hypfs_init)
+3
drivers/s390/crypto/ap_bus.c
··· 2086 2086 */ 2087 2087 static bool ap_get_configuration(void) 2088 2088 { 2089 + if (!ap_qci_info) /* QCI not supported */ 2090 + return false; 2091 + 2089 2092 memcpy(ap_qci_info_old, ap_qci_info, sizeof(*ap_qci_info)); 2090 2093 ap_fetch_qci_info(ap_qci_info); 2091 2094
+4
drivers/s390/crypto/ap_bus.h
··· 148 148 /* 149 149 * Called at the start of the ap bus scan function when 150 150 * the crypto config information (qci) has changed. 151 + * This callback is not invoked if there is no AP 152 + * QCI support available. 151 153 */ 152 154 void (*on_config_changed)(struct ap_config_info *new_config_info, 153 155 struct ap_config_info *old_config_info); 154 156 /* 155 157 * Called at the end of the ap bus scan function when 156 158 * the crypto config information (qci) has changed. 159 + * This callback is not invoked if there is no AP 160 + * QCI support available. 157 161 */ 158 162 void (*on_scan_complete)(struct ap_config_info *new_config_info, 159 163 struct ap_config_info *old_config_info);