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

Commit ffda4f71 authored by Felix Beck's avatar Felix Beck Committed by Martin Schwidefsky
Browse files

[S390] zcrypt: add support for cex3 device types 



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

Signed-off-by: default avatarFelix Beck <felix.beck@de.ibm.com>
Signed-off-by: default avatarRalph Wuerthner <ralph.wuerthner@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent a6a5d73a

drivers/s390/crypto/ap_bus.h

+2 −2
Original line number Diff line number Diff line
@@ -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

drivers/s390/crypto/zcrypt_api.c

+7 −2
Original line number Diff line number Diff line
@@ -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++);

drivers/s390/crypto/zcrypt_cex2a.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */ },

};

drivers/s390/crypto/zcrypt_pcixcc.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */ },

};