diff options
| author | Harald Freudenberger <freude@linux.vnet.ibm.com> | 2017-10-10 11:25:06 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2017-10-23 09:07:12 +0200 |
| commit | 21214b042d51b056b4eaa332b4cf426250d0e9e2 (patch) | |
| tree | 70051913e5a31d08451ba22824fb82fcc7be387d /drivers/s390/crypto/ap_queue.c | |
| parent | 3037a52f9846b9d6e233274453f2d4117a14f31b (diff) | |
| download | linux-stable-21214b042d51b056b4eaa332b4cf426250d0e9e2.tar.gz linux-stable-21214b042d51b056b4eaa332b4cf426250d0e9e2.tar.bz2 linux-stable-21214b042d51b056b4eaa332b4cf426250d0e9e2.zip | |
s390/zcrypt: CEX6S exploitation
This patch adds the full CEX6S card support to the zcrypt device
driver. A CEX6A/C/P is detected and displayed as such, the card
and queue device driver code is updated to recognize it and the
relative weight values for CEX4, CEX5 and CEX6 have been updated.
Signed-off-by: Harald Freudenberger <freude@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/crypto/ap_queue.c')
| -rw-r--r-- | drivers/s390/crypto/ap_queue.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/s390/crypto/ap_queue.c b/drivers/s390/crypto/ap_queue.c index 56b96edffd5b..d15903926f46 100644 --- a/drivers/s390/crypto/ap_queue.c +++ b/drivers/s390/crypto/ap_queue.c @@ -626,9 +626,6 @@ struct ap_queue *ap_queue_create(ap_qid_t qid, int device_type) aq->ap_dev.device.release = ap_queue_device_release; aq->ap_dev.device.type = &ap_queue_type; aq->ap_dev.device_type = device_type; - /* CEX6 toleration: map to CEX5 */ - if (device_type == AP_DEVICE_TYPE_CEX6) - aq->ap_dev.device_type = AP_DEVICE_TYPE_CEX5; aq->qid = qid; aq->state = AP_STATE_RESET_START; aq->interrupt = AP_INTR_DISABLED; |