s390/zcrypt: Correct function bits for CEX2x and CEX3x cards.

For the older CEX2x and CEX3x cards the function bits returned
by TAPQ do not reflect the functions of the card. Instead the
functionality is implicit by the type of the card. The reworked
zcrypt requires to have the function bits set correct, so this
patch fixes this. The queue selection is not only based on these
function bits but also on function pointers set by the individual
drivers.

Signed-off-by: Harald Freudenberger <freude@linux.vnet.ibm.com>
Signed-off-by: Ingo Tuchscherer <ingo.tuchscherer@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index ac6c258300cfbd92e8463c0066017b0c7c19d24a..b15013234c77a230c8775ac050e7d56a3048ab85 100644 (file)
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -273,6 +273,23 @@ static int ap_query_queue(ap_qid_t qid, int *queue_depth, int *device_type,
                nd = (info >> 16) & 0xff;
                if ((info & (1UL << 57)) && nd > 0)
                        ap_max_domain_id = nd;
+               switch (*device_type) {
+                       /* For CEX2 and CEX3 the available functions
+                        * are not refrected by the facilities bits.
+                        * Instead it is coded into the type. So here
+                        * modify the function bits based on the type.
+                        */
+               case AP_DEVICE_TYPE_CEX2A:
+               case AP_DEVICE_TYPE_CEX3A:
+                       *facilities |= 0x08000000;
+                       break;
+               case AP_DEVICE_TYPE_CEX2C:
+               case AP_DEVICE_TYPE_CEX3C:
+                       *facilities |= 0x10000000;
+                       break;
+               default:
+                       break;
+               }
                return 0;
        case AP_RESPONSE_Q_NOT_AVAIL:
        case AP_RESPONSE_DECONFIGURED:

diff --git a/drivers/s390/crypto/zcrypt_api.c b/drivers/s390/crypto/zcrypt_api.c
index c7b5e70f2938283af0492111c07b5458913e5f28..71e298fe339f17d2379f93c7f9c63d10d0df2a68 100644 (file)
--- a/drivers/s390/crypto/zcrypt_api.c
+++ b/drivers/s390/crypto/zcrypt_api.c
@@ -257,7 +257,7 @@ static long zcrypt_rsa_modexpo(struct ica_rsa_modexpo *mex)
                        continue;
                for_each_zcrypt_queue(zq, zc) {
                        /* check if device is online and eligible */
-                       if (!zq->online)
+                       if (!zq->online || !zq->ops->rsa_modexpo)
                                continue;
                        if (zcrypt_queue_compare(zq, pref_zq,
                                                 weight, pref_weight))
@@ -320,7 +320,7 @@ static long zcrypt_rsa_crt(struct ica_rsa_modexpo_crt *crt)
                        continue;
                for_each_zcrypt_queue(zq, zc) {
                        /* check if device is online and eligible */
-                       if (!zq->online)
+                       if (!zq->online || !zq->ops->rsa_modexpo_crt)
                                continue;
                        if (zcrypt_queue_compare(zq, pref_zq,
                                                 weight, pref_weight))
@@ -377,6 +377,7 @@ static long zcrypt_send_cprb(struct ica_xcRB *xcRB)
                for_each_zcrypt_queue(zq, zc) {
                        /* check if device is online and eligible */
                        if (!zq->online ||
+                           !zq->ops->send_cprb ||
                            ((*domain != (unsigned short) AUTOSELECT) &&
                             (*domain != AP_QID_QUEUE(zq->queue->qid))))
                                continue;
@@ -480,6 +481,7 @@ static long zcrypt_send_ep11_cprb(struct ep11_urb *xcrb)
                for_each_zcrypt_queue(zq, zc) {
                        /* check if device is online and eligible */
                        if (!zq->online ||
+                           !zq->ops->send_ep11_cprb ||
                            (targets &&
                             !is_desired_ep11_queue(zq->queue->qid,
                                                    target_num, targets)))
@@ -538,7 +540,7 @@ static long zcrypt_rng(char *buffer)
                        continue;
                for_each_zcrypt_queue(zq, zc) {
                        /* check if device is online and eligible */
-                       if (!zq->online)
+                       if (!zq->online || !zq->ops->rng)
                                continue;
                        if (zcrypt_queue_compare(zq, pref_zq,
                                                 weight, pref_weight))