[S390] zcrypt: add support for cex3 device types
[linux-2.6.git] / drivers / s390 / crypto / zcrypt_api.c
index 65b6a96..fe21477 100644 (file)
@@ -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++);