shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

s390/zcrypt: Introduce CEX6 toleration

Browse Source 
[ Upstream commit b3e8652bcb ]

Signed-off-by: Harald Freudenberger <freude@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Harald Freudenberger
2017-03-17 00:48:31 +00:00
committed by Greg Kroah-Hartman
parent 61a153d06e
commit e627116c0c
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/s390/crypto/ap_bus.c
View File

@@ -1712,6 +1712,9 @@ static void ap_scan_bus(struct work_struct *unused)
ap_dev->queue_depth = queue_depth; ap_dev->queue_depth = queue_depth;
ap_dev->raw_hwtype = device_type; ap_dev->raw_hwtype = device_type;
ap_dev->device_type = device_type; ap_dev->device_type = device_type;
/* CEX6 toleration: map to CEX5 */
if (device_type == AP_DEVICE_TYPE_CEX6)
ap_dev->device_type = AP_DEVICE_TYPE_CEX5;
ap_dev->functions = device_functions; ap_dev->functions = device_functions;
spin_lock_init(&ap_dev->lock); spin_lock_init(&ap_dev->lock);
INIT_LIST_HEAD(&ap_dev->pendingq); INIT_LIST_HEAD(&ap_dev->pendingq);

1
drivers/s390/crypto/ap_bus.h
View File

@@ -105,6 +105,7 @@ static inline int ap_test_bit(unsigned int *ptr, unsigned int nr)
#define AP_DEVICE_TYPE_CEX3C 9 #define AP_DEVICE_TYPE_CEX3C 9
#define AP_DEVICE_TYPE_CEX4 10 #define AP_DEVICE_TYPE_CEX4 10
#define AP_DEVICE_TYPE_CEX5 11 #define AP_DEVICE_TYPE_CEX5 11
#define AP_DEVICE_TYPE_CEX6 12
/* /*
* Known function facilities * Known function facilities