Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf2d007b authored by Holger Dengler's avatar Holger Dengler Committed by Martin Schwidefsky
Browse files

[S390] ap: skip device registration on type probe failure 



The registration of an ap device will be skipped, if the device type
probing fails.
Add names of current crypto adapters to the Kconfig help.

Signed-off-by: default avatarHolger Dengler <hd@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 89db4df1

drivers/crypto/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ config ZCRYPT 
	  + PCI-X Cryptographic Coprocessor (PCIXCC)

	  + Crypto Express2 Coprocessor (CEX2C)

	  + Crypto Express2 Accelerator (CEX2A)

	  + Crypto Express3 Coprocessor (CEX3C)

	  + Crypto Express3 Accelerator (CEX3A)



config ZCRYPT_MONOLITHIC

	bool "Monolithic zcrypt module"

drivers/s390/crypto/ap_bus.c

+6 −2
Original line number Diff line number Diff line
@@ -1183,8 +1183,12 @@ static void ap_scan_bus(struct work_struct *unused) 
		INIT_LIST_HEAD(&ap_dev->list);

		setup_timer(&ap_dev->timeout, ap_request_timeout,

			    (unsigned long) ap_dev);

		if (device_type == 0)

			ap_probe_device_type(ap_dev);

		if (device_type == 0) {

			if (ap_probe_device_type(ap_dev)) {

				kfree(ap_dev);

				continue;

			}

		}

		else

			ap_dev->device_type = device_type;