Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757224AbYGAMwh (ORCPT ); Tue, 1 Jul 2008 08:52:37 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756212AbYGAMuX (ORCPT ); Tue, 1 Jul 2008 08:50:23 -0400 Received: from mtagate4.de.ibm.com ([195.212.29.153]:65441 "EHLO mtagate4.de.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756677AbYGAMuS (ORCPT ); Tue, 1 Jul 2008 08:50:18 -0400 Message-Id: <20080701125001.167460745@de.ibm.com> References: <20080701124809.319736054@de.ibm.com> User-Agent: quilt/0.46-1 Date: Tue, 01 Jul 2008 14:48:23 +0200 From: Martin Schwidefsky To: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Ralph Wuerthner , Martin Schwidefsky Subject: [patch 14/14] zcrypt: Add additional card IDs to CEX2C and CEX2A Content-Disposition: inline; filename=133-crypto-y4.diff Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2573 Lines: 78 From: Ralph Wuerthner 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 Signed-off-by: Martin Schwidefsky --- drivers/s390/crypto/ap_bus.h | 2 ++ drivers/s390/crypto/zcrypt_cex2a.c | 1 + drivers/s390/crypto/zcrypt_pcixcc.c | 1 + include/asm-s390/zcrypt.h | 2 +- 4 files changed, 5 insertions(+), 1 deletion(-) Index: quilt-2.6/drivers/s390/crypto/ap_bus.h =================================================================== --- quilt-2.6.orig/drivers/s390/crypto/ap_bus.h +++ quilt-2.6/drivers/s390/crypto/ap_bus.h @@ -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: quilt-2.6/drivers/s390/crypto/zcrypt_cex2a.c =================================================================== --- quilt-2.6.orig/drivers/s390/crypto/zcrypt_cex2a.c +++ quilt-2.6/drivers/s390/crypto/zcrypt_cex2a.c @@ -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: quilt-2.6/drivers/s390/crypto/zcrypt_pcixcc.c =================================================================== --- quilt-2.6.orig/drivers/s390/crypto/zcrypt_pcixcc.c +++ quilt-2.6/drivers/s390/crypto/zcrypt_pcixcc.c @@ -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: quilt-2.6/include/asm-s390/zcrypt.h =================================================================== --- quilt-2.6.orig/include/asm-s390/zcrypt.h +++ quilt-2.6/include/asm-s390/zcrypt.h @@ -29,7 +29,7 @@ #define ZCRYPT_VERSION 2 #define ZCRYPT_RELEASE 1 -#define ZCRYPT_VARIANT 0 +#define ZCRYPT_VARIANT 1 #include #include -- blue skies, Martin. "Reality continues to ruin my life." - Calvin. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/