Commit ce549410 authored by Sumit Semwal's avatar Sumit Semwal Committed by Greg Kroah-Hartman

s390/zcrypt: Introduce CEX6 toleration

From: Harald Freudenberger <freude@linux.vnet.ibm.com>

[ Upstream commit b3e8652b ]
Signed-off-by: default avatarHarald Freudenberger <freude@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSumit Semwal <sumit.semwal@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7023f502
...@@ -1651,6 +1651,9 @@ static void ap_scan_bus(struct work_struct *unused) ...@@ -1651,6 +1651,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);
......
...@@ -105,6 +105,7 @@ static inline int ap_test_bit(unsigned int *ptr, unsigned int nr) ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment