s390/zcrypt: Add support for CEX4 crypto card

New zcrypt module supports IBM CryptoExpress 4 cards. Signed-off-by: Holger Dengler <hd@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
author: Holger Dengler <hd@linux.vnet.ibm.com> 2012-08-28 10:48:29 -0400
committer: Martin Schwidefsky <schwidefsky@de.ibm.com> 2012-09-26 09:44:56 -0400
commit: 1e2076f4527b5b0854d0ebe60102b6710a9ba64c (patch)
tree: 66b42d73944010bbbffe9cfd0b0470ffe8ce8c44
parent: 5e55a488c87aa6cc269b04bfec99e835f03b2c2d (diff)
5 files changed, 170 insertions, 16 deletions
diff --git a/drivers/s390/crypto/Makefile b/drivers/s390/crypto/Makefile
index eca0bfaae08a..771faf7094d6 100644
--- a/drivers/s390/crypto/Makefile
+++ b/drivers/s390/crypto/Makefile
@@ -4,5 +4,5 @@
 ap-objs := ap_bus.o
 obj-$(CONFIG_ZCRYPT) += ap.o zcrypt_api.o zcrypt_pcicc.o zcrypt_pcixcc.o
-obj-$(CONFIG_ZCRYPT) += zcrypt_pcica.o zcrypt_cex2a.o
+obj-$(CONFIG_ZCRYPT) += zcrypt_pcica.o zcrypt_cex2a.o zcrypt_cex4.o
 obj-$(CONFIG_ZCRYPT) += zcrypt_msgtype6.o zcrypt_msgtype50.o
diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index f0b53ee6802f..39e5eb263e4b 100644
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -1340,30 +1340,22 @@ static void ap_scan_bus(struct work_struct *unused)
                            (unsigned long) ap_dev);
                switch (device_type) {
                case 0:
+                        /* device type probing for old cards */
                        if (ap_probe_device_type(ap_dev)) {
                                kfree(ap_dev);
                                continue;
                        }
                        break;
-                case 10:
-                        if (ap_query_functions(qid, &device_functions)) {
-                                kfree(ap_dev);
-                                continue;
-                        }
-                        ap_dev->functions = device_functions;
-                        if (ap_test_bit(&device_functions, 3))
-                                ap_dev->device_type = AP_DEVICE_TYPE_CEX3C;
-                        else if (ap_test_bit(&device_functions, 4))
-                                ap_dev->device_type = AP_DEVICE_TYPE_CEX3A;
-                        else {
-                                kfree(ap_dev);
-                                continue;
-                        }
-                        break;
                default:
                        ap_dev->device_type = device_type;
                }
+                rc = ap_query_functions(qid, &device_functions);
+                if (!rc)
+                        ap_dev->functions = device_functions;
+                else
+                        ap_dev->functions = 0u;
                ap_dev->device.bus = &ap_bus_type;
                ap_dev->device.parent = ap_root_device;
                if (dev_set_name(&ap_dev->device, "card%02x",
diff --git a/drivers/s390/crypto/ap_bus.h b/drivers/s390/crypto/ap_bus.h
index e49bcf4d4081..e9b963e7d59d 100644
--- a/drivers/s390/crypto/ap_bus.h
+++ b/drivers/s390/crypto/ap_bus.h
@@ -116,6 +116,7 @@ static inline int ap_test_bit(unsigned int *ptr, unsigned int nr)
 #define AP_DEVICE_TYPE_CEX2C    7
 #define AP_DEVICE_TYPE_CEX3A    8
 #define AP_DEVICE_TYPE_CEX3C    9
+#define AP_DEVICE_TYPE_CEX4     10
 /*
 * Known function facilities
diff --git a/drivers/s390/crypto/zcrypt_cex4.c b/drivers/s390/crypto/zcrypt_cex4.c
new file mode 100644
index 000000000000..ce1226398ac9
--- /dev/null
+++ b/drivers/s390/crypto/zcrypt_cex4.c
@@ -0,0 +1,149 @@
+/*
+ *  Copyright IBM Corp. 2012
+ *  Author(s): Holger Dengler <hd@linux.vnet.ibm.com>
+ */
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/init.h>
+#include <linux/err.h>
+#include <linux/atomic.h>
+#include <linux/uaccess.h>
+#include "ap_bus.h"
+#include "zcrypt_api.h"
+#include "zcrypt_msgtype6.h"
+#include "zcrypt_msgtype50.h"
+#include "zcrypt_error.h"
+#include "zcrypt_cex4.h"
+#define CEX4A_MIN_MOD_SIZE        1     /*    8 bits    */
+#define CEX4A_MAX_MOD_SIZE_2K   256     /* 2048 bits    */
+#define CEX4A_MAX_MOD_SIZE_4K   512     /* 4096 bits    */
+#define CEX4C_MIN_MOD_SIZE       16     /*  256 bits    */
+#define CEX4C_MAX_MOD_SIZE      512     /* 4096 bits    */
+#define CEX4A_SPEED_RATING      900      /* TODO new card, new speed rating */
+#define CEX4C_SPEED_RATING      6500     /* TODO new card, new speed rating */
+#define CEX4A_MAX_MESSAGE_SIZE  MSGTYPE50_CRB3_MAX_MSG_SIZE
+#define CEX4C_MAX_MESSAGE_SIZE  MSGTYPE06_MAX_MSG_SIZE
+#define CEX4_CLEANUP_TIME       (15*HZ)
+static struct ap_device_id zcrypt_cex4_ids[] = {
+        { AP_DEVICE(AP_DEVICE_TYPE_CEX4)  },
+        { /* end of list */ },
+};
+MODULE_DEVICE_TABLE(ap, zcrypt_cex4_ids);
+MODULE_AUTHOR("IBM Corporation");
+MODULE_DESCRIPTION("CEX4 Cryptographic Card device driver, " \
+                   "Copyright IBM Corp. 2012");
+MODULE_LICENSE("GPL");
+static int zcrypt_cex4_probe(struct ap_device *ap_dev);
+static void zcrypt_cex4_remove(struct ap_device *ap_dev);
+static struct ap_driver zcrypt_cex4_driver = {
+        .probe = zcrypt_cex4_probe,
+        .remove = zcrypt_cex4_remove,
+        .ids = zcrypt_cex4_ids,
+        .request_timeout = CEX4_CLEANUP_TIME,
+};
+/**
+ * Probe function for CEX4 cards. It always accepts the AP device
+ * since the bus_match already checked the hardware type.
+ * @ap_dev: pointer to the AP device.
+ */
+static int zcrypt_cex4_probe(struct ap_device *ap_dev)
+{
+        struct zcrypt_device *zdev = NULL;
+        int rc = 0;
+        switch (ap_dev->device_type) {
+        case AP_DEVICE_TYPE_CEX4:
+                if (ap_test_bit(&ap_dev->functions, AP_FUNC_ACCEL)) {
+                        zdev = zcrypt_device_alloc(CEX4A_MAX_MESSAGE_SIZE);
+                        if (!zdev)
+                                return -ENOMEM;
+                        zdev->type_string = "CEX4A";
+                        zdev->user_space_type = ZCRYPT_CEX3A;
+                        zdev->min_mod_size = CEX4A_MIN_MOD_SIZE;
+                        if (ap_test_bit(&ap_dev->functions, AP_FUNC_MEX4K) &&
+                            ap_test_bit(&ap_dev->functions, AP_FUNC_CRT4K)) {
+                                zdev->max_mod_size =
+                                        CEX4A_MAX_MOD_SIZE_4K;
+                                zdev->max_exp_bit_length =
+                                        CEX4A_MAX_MOD_SIZE_4K;
+                        } else {
+                                zdev->max_mod_size =
+                                        CEX4A_MAX_MOD_SIZE_2K;
+                                zdev->max_exp_bit_length =
+                                        CEX4A_MAX_MOD_SIZE_2K;
+                        }
+                        zdev->short_crt = 1;
+                        zdev->speed_rating = CEX4A_SPEED_RATING;
+                        zdev->ops = zcrypt_msgtype_request(MSGTYPE50_NAME,
+                                                           MSGTYPE50_VARIANT_DEFAULT);
+                } else if (ap_test_bit(&ap_dev->functions, AP_FUNC_COPRO)) {
+                        zdev = zcrypt_device_alloc(CEX4C_MAX_MESSAGE_SIZE);
+                        if (!zdev)
+                                return -ENOMEM;
+                        zdev->type_string = "CEX4C";
+                        zdev->user_space_type = ZCRYPT_CEX3C;
+                        zdev->min_mod_size = CEX4C_MIN_MOD_SIZE;
+                        zdev->max_mod_size = CEX4C_MAX_MOD_SIZE;
+                        zdev->max_exp_bit_length = CEX4C_MAX_MOD_SIZE;
+                        zdev->short_crt = 0;
+                        zdev->speed_rating = CEX4C_SPEED_RATING;
+                        zdev->ops = zcrypt_msgtype_request(MSGTYPE06_NAME,
+                                                           MSGTYPE06_VARIANT_DEFAULT);
+                }
+                break;
+        }
+        if (!zdev)
+                return -ENODEV;
+        zdev->ap_dev = ap_dev;
+        zdev->online = 1;
+        ap_dev->reply = &zdev->reply;
+        ap_dev->private = zdev;
+        rc = zcrypt_device_register(zdev);
+        if (rc) {
+                zcrypt_msgtype_release(zdev->ops);
+                ap_dev->private = NULL;
+                zcrypt_device_free(zdev);
+        }
+        return rc;
+}
+/**
+ * This is called to remove the extended CEX4 driver information
+ * if an AP device is removed.
+ */
+static void zcrypt_cex4_remove(struct ap_device *ap_dev)
+{
+        struct zcrypt_device *zdev = ap_dev->private;
+        struct zcrypt_ops *zops;
+        if (zdev) {
+                zops = zdev->ops;
+                zcrypt_device_unregister(zdev);
+                zcrypt_msgtype_release(zops);
+        }
+}
+int __init zcrypt_cex4_init(void)
+{
+        return ap_driver_register(&zcrypt_cex4_driver, THIS_MODULE, "cex4");
+}
+void __exit zcrypt_cex4_exit(void)
+{
+        ap_driver_unregister(&zcrypt_cex4_driver);
+}
+module_init(zcrypt_cex4_init);
+module_exit(zcrypt_cex4_exit);
diff --git a/drivers/s390/crypto/zcrypt_cex4.h b/drivers/s390/crypto/zcrypt_cex4.h
new file mode 100644
index 000000000000..719571375ccc
--- /dev/null
+++ b/drivers/s390/crypto/zcrypt_cex4.h
@@ -0,0 +1,12 @@
+/*
+ *  Copyright IBM Corp. 2012
+ *  Author(s): Holger Dengler <hd@linux.vnet.ibm.com>
+ */
+#ifndef _ZCRYPT_CEX4_H_
+#define _ZCRYPT_CEX4_H_
+int zcrypt_cex4_init(void);
+void zcrypt_cex4_exit(void);
+#endif /* _ZCRYPT_CEX4_H_ */
author	Holger Dengler <hd@linux.vnet.ibm.com>	2012-08-28 10:48:29 -0400
committer	Martin Schwidefsky <schwidefsky@de.ibm.com>	2012-09-26 09:44:56 -0400
commit	1e2076f4527b5b0854d0ebe60102b6710a9ba64c (patch)
tree	66b42d73944010bbbffe9cfd0b0470ffe8ce8c44
parent	5e55a488c87aa6cc269b04bfec99e835f03b2c2d (diff)

diff --git a/drivers/s390/crypto/Makefile b/drivers/s390/crypto/Makefile index eca0bfaae08a..771faf7094d6 100644 --- a/drivers/s390/crypto/Makefile +++ b/drivers/s390/crypto/Makefile
@@ -4,5 +4,5 @@
4		4
5	ap-objs := ap_bus.o	5	ap-objs := ap_bus.o
6	obj-$(CONFIG_ZCRYPT) += ap.o zcrypt_api.o zcrypt_pcicc.o zcrypt_pcixcc.o	6	obj-$(CONFIG_ZCRYPT) += ap.o zcrypt_api.o zcrypt_pcicc.o zcrypt_pcixcc.o
7	obj-$(CONFIG_ZCRYPT) += zcrypt_pcica.o zcrypt_cex2a.o	7	obj-$(CONFIG_ZCRYPT) += zcrypt_pcica.o zcrypt_cex2a.o zcrypt_cex4.o
8	obj-$(CONFIG_ZCRYPT) += zcrypt_msgtype6.o zcrypt_msgtype50.o	8	obj-$(CONFIG_ZCRYPT) += zcrypt_msgtype6.o zcrypt_msgtype50.o


diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c index f0b53ee6802f..39e5eb263e4b 100644 --- a/drivers/s390/crypto/ap_bus.c +++ b/drivers/s390/crypto/ap_bus.c
@@ -1340,30 +1340,22 @@ static void ap_scan_bus(struct work_struct *unused)
1340	(unsigned long) ap_dev);	1340	(unsigned long) ap_dev);
1341	switch (device_type) {	1341	switch (device_type) {
1342	case 0:	1342	case 0:
		1343	/* device type probing for old cards */
1343	if (ap_probe_device_type(ap_dev)) {	1344	if (ap_probe_device_type(ap_dev)) {
1344	kfree(ap_dev);	1345	kfree(ap_dev);
1345	continue;	1346	continue;
1346	}	1347	}
1347	break;	1348	break;
1348	case 10:
1349	if (ap_query_functions(qid, &device_functions)) {
1350	kfree(ap_dev);
1351	continue;
1352	}
1353	ap_dev->functions = device_functions;
1354	if (ap_test_bit(&device_functions, 3))
1355	ap_dev->device_type = AP_DEVICE_TYPE_CEX3C;
1356	else if (ap_test_bit(&device_functions, 4))
1357	ap_dev->device_type = AP_DEVICE_TYPE_CEX3A;
1358	else {
1359	kfree(ap_dev);
1360	continue;
1361	}
1362	break;
1363	default:	1349	default:
1364	ap_dev->device_type = device_type;	1350	ap_dev->device_type = device_type;
1365	}	1351	}
1366		1352
		1353	rc = ap_query_functions(qid, &device_functions);
		1354	if (!rc)
		1355	ap_dev->functions = device_functions;
		1356	else
		1357	ap_dev->functions = 0u;
		1358
1367	ap_dev->device.bus = &ap_bus_type;	1359	ap_dev->device.bus = &ap_bus_type;
1368	ap_dev->device.parent = ap_root_device;	1360	ap_dev->device.parent = ap_root_device;
1369	if (dev_set_name(&ap_dev->device, "card%02x",	1361	if (dev_set_name(&ap_dev->device, "card%02x",


diff --git a/drivers/s390/crypto/ap_bus.h b/drivers/s390/crypto/ap_bus.h index e49bcf4d4081..e9b963e7d59d 100644 --- a/drivers/s390/crypto/ap_bus.h +++ b/drivers/s390/crypto/ap_bus.h
@@ -116,6 +116,7 @@ static inline int ap_test_bit(unsigned int *ptr, unsigned int nr)
116	#define AP_DEVICE_TYPE_CEX2C 7	116	#define AP_DEVICE_TYPE_CEX2C 7
117	#define AP_DEVICE_TYPE_CEX3A 8	117	#define AP_DEVICE_TYPE_CEX3A 8
118	#define AP_DEVICE_TYPE_CEX3C 9	118	#define AP_DEVICE_TYPE_CEX3C 9
		119	#define AP_DEVICE_TYPE_CEX4 10
119		120
120	/*	121	/*
121	* Known function facilities	122	* Known function facilities


diff --git a/drivers/s390/crypto/zcrypt_cex4.c b/drivers/s390/crypto/zcrypt_cex4.c new file mode 100644 index 000000000000..ce1226398ac9 --- /dev/null +++ b/drivers/s390/crypto/zcrypt_cex4.c
@@ -0,0 +1,149 @@
		1	/*
		2	* Copyright IBM Corp. 2012
		3	* Author(s): Holger Dengler <hd@linux.vnet.ibm.com>
		4	*/
		5
		6	#include <linux/module.h>
		7	#include <linux/slab.h>
		8	#include <linux/init.h>
		9	#include <linux/err.h>
		10	#include <linux/atomic.h>
		11	#include <linux/uaccess.h>
		12
		13	#include "ap_bus.h"
		14	#include "zcrypt_api.h"
		15	#include "zcrypt_msgtype6.h"
		16	#include "zcrypt_msgtype50.h"
		17	#include "zcrypt_error.h"
		18	#include "zcrypt_cex4.h"
		19
		20	#define CEX4A_MIN_MOD_SIZE 1 /* 8 bits */
		21	#define CEX4A_MAX_MOD_SIZE_2K 256 /* 2048 bits */
		22	#define CEX4A_MAX_MOD_SIZE_4K 512 /* 4096 bits */
		23
		24	#define CEX4C_MIN_MOD_SIZE 16 /* 256 bits */
		25	#define CEX4C_MAX_MOD_SIZE 512 /* 4096 bits */
		26
		27	#define CEX4A_SPEED_RATING 900 /* TODO new card, new speed rating */
		28	#define CEX4C_SPEED_RATING 6500 /* TODO new card, new speed rating */
		29
		30	#define CEX4A_MAX_MESSAGE_SIZE MSGTYPE50_CRB3_MAX_MSG_SIZE
		31	#define CEX4C_MAX_MESSAGE_SIZE MSGTYPE06_MAX_MSG_SIZE
		32
		33	#define CEX4_CLEANUP_TIME (15*HZ)
		34
		35	static struct ap_device_id zcrypt_cex4_ids[] = {
		36	{ AP_DEVICE(AP_DEVICE_TYPE_CEX4) },
		37	{ /* end of list */ },
		38	};
		39
		40	MODULE_DEVICE_TABLE(ap, zcrypt_cex4_ids);
		41	MODULE_AUTHOR("IBM Corporation");
		42	MODULE_DESCRIPTION("CEX4 Cryptographic Card device driver, " \
		43	"Copyright IBM Corp. 2012");
		44	MODULE_LICENSE("GPL");
		45
		46	static int zcrypt_cex4_probe(struct ap_device *ap_dev);
		47	static void zcrypt_cex4_remove(struct ap_device *ap_dev);
		48
		49	static struct ap_driver zcrypt_cex4_driver = {
		50	.probe = zcrypt_cex4_probe,
		51	.remove = zcrypt_cex4_remove,
		52	.ids = zcrypt_cex4_ids,
		53	.request_timeout = CEX4_CLEANUP_TIME,
		54	};
		55
		56	/**
		57	* Probe function for CEX4 cards. It always accepts the AP device
		58	* since the bus_match already checked the hardware type.
		59	* @ap_dev: pointer to the AP device.
		60	*/
		61	static int zcrypt_cex4_probe(struct ap_device *ap_dev)
		62	{
		63	struct zcrypt_device *zdev = NULL;
		64	int rc = 0;
		65
		66	switch (ap_dev->device_type) {
		67	case AP_DEVICE_TYPE_CEX4:
		68	if (ap_test_bit(&ap_dev->functions, AP_FUNC_ACCEL)) {
		69	zdev = zcrypt_device_alloc(CEX4A_MAX_MESSAGE_SIZE);
		70	if (!zdev)
		71	return -ENOMEM;
		72	zdev->type_string = "CEX4A";
		73	zdev->user_space_type = ZCRYPT_CEX3A;
		74	zdev->min_mod_size = CEX4A_MIN_MOD_SIZE;
		75	if (ap_test_bit(&ap_dev->functions, AP_FUNC_MEX4K) &&
		76	ap_test_bit(&ap_dev->functions, AP_FUNC_CRT4K)) {
		77	zdev->max_mod_size =
		78	CEX4A_MAX_MOD_SIZE_4K;
		79	zdev->max_exp_bit_length =
		80	CEX4A_MAX_MOD_SIZE_4K;
		81	} else {
		82	zdev->max_mod_size =
		83	CEX4A_MAX_MOD_SIZE_2K;
		84	zdev->max_exp_bit_length =
		85	CEX4A_MAX_MOD_SIZE_2K;
		86	}
		87	zdev->short_crt = 1;
		88	zdev->speed_rating = CEX4A_SPEED_RATING;
		89	zdev->ops = zcrypt_msgtype_request(MSGTYPE50_NAME,
		90	MSGTYPE50_VARIANT_DEFAULT);
		91	} else if (ap_test_bit(&ap_dev->functions, AP_FUNC_COPRO)) {
		92	zdev = zcrypt_device_alloc(CEX4C_MAX_MESSAGE_SIZE);
		93	if (!zdev)
		94	return -ENOMEM;
		95	zdev->type_string = "CEX4C";
		96	zdev->user_space_type = ZCRYPT_CEX3C;
		97	zdev->min_mod_size = CEX4C_MIN_MOD_SIZE;
		98	zdev->max_mod_size = CEX4C_MAX_MOD_SIZE;
		99	zdev->max_exp_bit_length = CEX4C_MAX_MOD_SIZE;
		100	zdev->short_crt = 0;
		101	zdev->speed_rating = CEX4C_SPEED_RATING;
		102	zdev->ops = zcrypt_msgtype_request(MSGTYPE06_NAME,
		103	MSGTYPE06_VARIANT_DEFAULT);
		104	}
		105	break;
		106	}
		107	if (!zdev)
		108	return -ENODEV;
		109	zdev->ap_dev = ap_dev;
		110	zdev->online = 1;
		111	ap_dev->reply = &zdev->reply;
		112	ap_dev->private = zdev;
		113	rc = zcrypt_device_register(zdev);
		114	if (rc) {
		115	zcrypt_msgtype_release(zdev->ops);
		116	ap_dev->private = NULL;
		117	zcrypt_device_free(zdev);
		118	}
		119	return rc;
		120	}
		121
		122	/**
		123	* This is called to remove the extended CEX4 driver information
		124	* if an AP device is removed.
		125	*/
		126	static void zcrypt_cex4_remove(struct ap_device *ap_dev)
		127	{
		128	struct zcrypt_device *zdev = ap_dev->private;
		129	struct zcrypt_ops *zops;
		130
		131	if (zdev) {
		132	zops = zdev->ops;
		133	zcrypt_device_unregister(zdev);
		134	zcrypt_msgtype_release(zops);
		135	}
		136	}
		137
		138	int __init zcrypt_cex4_init(void)
		139	{
		140	return ap_driver_register(&zcrypt_cex4_driver, THIS_MODULE, "cex4");
		141	}
		142
		143	void __exit zcrypt_cex4_exit(void)
		144	{
		145	ap_driver_unregister(&zcrypt_cex4_driver);
		146	}
		147
		148	module_init(zcrypt_cex4_init);
		149	module_exit(zcrypt_cex4_exit);


diff --git a/drivers/s390/crypto/zcrypt_cex4.h b/drivers/s390/crypto/zcrypt_cex4.h new file mode 100644 index 000000000000..719571375ccc --- /dev/null +++ b/drivers/s390/crypto/zcrypt_cex4.h
@@ -0,0 +1,12 @@
		1	/*
		2	* Copyright IBM Corp. 2012
		3	* Author(s): Holger Dengler <hd@linux.vnet.ibm.com>
		4	*/
		5
		6	#ifndef _ZCRYPT_CEX4_H_
		7	#define _ZCRYPT_CEX4_H_
		8
		9	int zcrypt_cex4_init(void);
		10	void zcrypt_cex4_exit(void);
		11
		12	#endif /* _ZCRYPT_CEX4_H_ */