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

Commit d8c33d32 authored by Ralph Wuerthner's avatar Ralph Wuerthner Committed by Heiko Carstens
Browse files

[S390] zcrypt: Add additional card IDs to CEX2C and CEX2A 



Add support for new micro code load of CEX2C and CEX2A adapters,
which uses different IDs.  This patch just adds the IDs to the
existing drivers.

Signed-off-by: default avatarRalph Wuerthner <ralph.wuerthner@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
parent a0443fbb

drivers/s390/crypto/ap_bus.h

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



/*

 * AP reset flag states

drivers/s390/crypto/zcrypt_cex2a.c

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 


static struct ap_device_id zcrypt_cex2a_ids[] = {

	{ AP_DEVICE(AP_DEVICE_TYPE_CEX2A) },

	{ AP_DEVICE(AP_DEVICE_TYPE_CEX2A2) },

	{ /* end of list */ },

};

drivers/s390/crypto/zcrypt_pcixcc.c

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +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) },

	{ /* end of list */ },

};

include/asm-s390/zcrypt.h

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 


#define ZCRYPT_VERSION 2

#define ZCRYPT_RELEASE 1

#define ZCRYPT_VARIANT 0

#define ZCRYPT_VARIANT 1



#include <linux/ioctl.h>

#include <linux/compiler.h>