[S390] zcrypt: add support for cex3 device types

This patch renames the CEX2C2 and CEX2A2 types to CEX3 device types.

Signed-off-by: Felix Beck <felix.beck@de.ibm.com>
Signed-off-by: Ralph Wuerthner <ralph.wuerthner@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

4 files changed, 11 insertions, 6 deletions

diff --git a/drivers/s390/crypto/ap_bus.h b/drivers/s390/crypto/ap_bus.h
index c37466713b32..4785d07cd447 100644
--- a/drivers/s390/crypto/ap_bus.h
+++ b/drivers/s390/crypto/ap_bus.h
@@ -97,8 +97,8 @@ struct ap_queue_status {
 #define AP_DEVICE_TYPE_PCIXCC   5
 #define AP_DEVICE_TYPE_CEX2A    6
 #define AP_DEVICE_TYPE_CEX2C    7
-#define AP_DEVICE_TYPE_CEX2A2   8
-#define AP_DEVICE_TYPE_CEX2C2   9
+#define AP_DEVICE_TYPE_CEX3A    8
+#define AP_DEVICE_TYPE_CEX3C    9
 
 /*
  * AP reset flag states
diff --git a/drivers/s390/crypto/zcrypt_api.c b/drivers/s390/crypto/zcrypt_api.c
index 65b6a96afe6b..fe214770f2e7 100644
--- a/drivers/s390/crypto/zcrypt_api.c
+++ b/drivers/s390/crypto/zcrypt_api.c
@@ -1009,6 +1009,10 @@ static int zcrypt_status_read(char *resp_buff, char **start, off_t offset,
                        zcrypt_count_type(ZCRYPT_CEX2C));
         len += sprintf(resp_buff + len, "CEX2A count: %d\n",
                        zcrypt_count_type(ZCRYPT_CEX2A));
+        len += sprintf(resp_buff + len, "CEX3C count: %d\n",
+                       zcrypt_count_type(ZCRYPT_CEX3C));
+        len += sprintf(resp_buff + len, "CEX3A count: %d\n",
+                       zcrypt_count_type(ZCRYPT_CEX3A));
         len += sprintf(resp_buff + len, "requestq count: %d\n",
                        zcrypt_requestq_count());
         len += sprintf(resp_buff + len, "pendingq count: %d\n",
@@ -1017,7 +1021,7 @@ static int zcrypt_status_read(char *resp_buff, char **start, off_t offset,
                        atomic_read(&zcrypt_open_count));
         zcrypt_status_mask(workarea);
         len += sprinthx("Online devices: 1=PCICA 2=PCICC 3=PCIXCC(MCL2) "
-                        "4=PCIXCC(MCL3) 5=CEX2C 6=CEX2A",
+                        "4=PCIXCC(MCL3) 5=CEX2C 6=CEX2A 7=CEX3C 8=CEX3A",
                         resp_buff+len, workarea, AP_DEVICES);
         zcrypt_qdepth_mask(workarea);
         len += sprinthx("Waiting work element counts",
@@ -1095,8 +1099,9 @@ static int zcrypt_status_write(struct file *file, const char __user *buffer,
                  * '0' for no device, '1' for PCICA, '2' for PCICC,
                  * '3' for PCIXCC_MCL2, '4' for PCIXCC_MCL3,
                  * '5' for CEX2C and '6' for CEX2A'
+                 * '7' for CEX3C and '8' for CEX3A
                  */
-                if (*ptr >= '0' && *ptr <= '6')
+                if (*ptr >= '0' && *ptr <= '8')
                         j++;
                 else if (*ptr == 'd' || *ptr == 'D')
                         zcrypt_disable_card(j++);
diff --git a/drivers/s390/crypto/zcrypt_cex2a.c b/drivers/s390/crypto/zcrypt_cex2a.c
index ad61a6a59374..d25b6dfed2e0 100644
--- a/drivers/s390/crypto/zcrypt_cex2a.c
+++ b/drivers/s390/crypto/zcrypt_cex2a.c
@@ -49,7 +49,7 @@
 
 static struct ap_device_id zcrypt_cex2a_ids[] = {
         { AP_DEVICE(AP_DEVICE_TYPE_CEX2A) },
-        { AP_DEVICE(AP_DEVICE_TYPE_CEX2A2) },
+        { AP_DEVICE(AP_DEVICE_TYPE_CEX3A) },
         { /* end of list */ },
 };
 
diff --git a/drivers/s390/crypto/zcrypt_pcixcc.c b/drivers/s390/crypto/zcrypt_pcixcc.c
index addaaddaf994..cdaa401f20cd 100644
--- a/drivers/s390/crypto/zcrypt_pcixcc.c
+++ b/drivers/s390/crypto/zcrypt_pcixcc.c
@@ -72,7 +72,7 @@ struct response_type {
 static struct ap_device_id zcrypt_pcixcc_ids[] = {
         { AP_DEVICE(AP_DEVICE_TYPE_PCIXCC) },
         { AP_DEVICE(AP_DEVICE_TYPE_CEX2C) },
-        { AP_DEVICE(AP_DEVICE_TYPE_CEX2C2) },
+        { AP_DEVICE(AP_DEVICE_TYPE_CEX3C) },
         { /* end of list */ },
 };