]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[S390] zcrypt: Add additional card IDs to CEX2C and CEX2A
authorRalph Wuerthner <ralph.wuerthner@de.ibm.com>
Mon, 14 Jul 2008 07:59:10 +0000 (09:59 +0200)
committerHeiko Carstens <heiko.carstens@de.ibm.com>
Mon, 14 Jul 2008 08:02:14 +0000 (10:02 +0200)
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: Ralph Wuerthner <ralph.wuerthner@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
drivers/s390/crypto/ap_bus.h
drivers/s390/crypto/zcrypt_cex2a.c
drivers/s390/crypto/zcrypt_pcixcc.c
include/asm-s390/zcrypt.h

index c1e1200c43fc7a211b68a10048207470e810aef4..446378b308fcf2ca6447816cfc2daab59c481536 100644 (file)
@@ -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
index 08657f604b8c7c392397d9ae8b5aa3f6a8c18e4b..78ffba1dd613bbe18bffe2d41e839fc733b3c15d 100644 (file)
@@ -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 */ },
 };
 
index 0bc9b3188e64964ab2b98049e8f8ff518f3209b6..4040c1c981d1a361a72883bf5072740c6d9e0bad 100644 (file)
@@ -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 */ },
 };
 
index f228f1b86877feabca366cb1db8a8dec1930b6d6..00d3bbd44117fe2093abe6dfca8ec6d6bb3e93cf 100644 (file)
@@ -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>