s390/ap: move receive callback to message struct

Move the receive callback from zdev_driver to ap_message structure to
get a more flexible asynchronous ap message handling.

Signed-off-by: Holger Dengler <hd@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

6 files changed, 24 insertions, 13 deletions

diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index 7e9a72eb2fe..cd2103c1d91 100644
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -836,12 +836,12 @@ static void __ap_flush_queue(struct ap_device *ap_dev)
         list_for_each_entry_safe(ap_msg, next, &ap_dev->pendingq, list) {
                 list_del_init(&ap_msg->list);
                 ap_dev->pendingq_count--;
-                ap_dev->drv->receive(ap_dev, ap_msg, ERR_PTR(-ENODEV));
+                ap_msg->receive(ap_dev, ap_msg, ERR_PTR(-ENODEV));
         }
         list_for_each_entry_safe(ap_msg, next, &ap_dev->requestq, list) {
                 list_del_init(&ap_msg->list);
                 ap_dev->requestq_count--;
-                ap_dev->drv->receive(ap_dev, ap_msg, ERR_PTR(-ENODEV));
+                ap_msg->receive(ap_dev, ap_msg, ERR_PTR(-ENODEV));
         }
 }
 
@@ -1329,7 +1329,7 @@ static int ap_poll_read(struct ap_device *ap_dev, unsigned long *flags)
                                 continue;
                         list_del_init(&ap_msg->list);
                         ap_dev->pendingq_count--;
-                        ap_dev->drv->receive(ap_dev, ap_msg, ap_dev->reply);
+                        ap_msg->receive(ap_dev, ap_msg, ap_dev->reply);
                         break;
                 }
                 if (ap_dev->queue_count > 0)
@@ -1450,10 +1450,10 @@ static int __ap_queue_message(struct ap_device *ap_dev, struct ap_message *ap_ms
                         return -EBUSY;
                 case AP_RESPONSE_REQ_FAC_NOT_INST:
                 case AP_RESPONSE_MESSAGE_TOO_BIG:
-                        ap_dev->drv->receive(ap_dev, ap_msg, ERR_PTR(-EINVAL));
+                        ap_msg->receive(ap_dev, ap_msg, ERR_PTR(-EINVAL));
                         return -EINVAL;
                 default:        /* Device is gone. */
-                        ap_dev->drv->receive(ap_dev, ap_msg, ERR_PTR(-ENODEV));
+                        ap_msg->receive(ap_dev, ap_msg, ERR_PTR(-ENODEV));
                         return -ENODEV;
                 }
         } else {
@@ -1471,6 +1471,10 @@ void ap_queue_message(struct ap_device *ap_dev, struct ap_message *ap_msg)
         unsigned long flags;
         int rc;
 
+        /* For asynchronous message handling a valid receive-callback
+         * is required. */
+        BUG_ON(!ap_msg->receive);
+
         spin_lock_bh(&ap_dev->lock);
         if (!ap_dev->unregistered) {
                 /* Make room on the queue by polling for finished requests. */
@@ -1482,7 +1486,7 @@ void ap_queue_message(struct ap_device *ap_dev, struct ap_message *ap_msg)
                 if (rc == -ENODEV)
                         ap_dev->unregistered = 1;
         } else {
-                ap_dev->drv->receive(ap_dev, ap_msg, ERR_PTR(-ENODEV));
+                ap_msg->receive(ap_dev, ap_msg, ERR_PTR(-ENODEV));
                 rc = -ENODEV;
         }
         spin_unlock_bh(&ap_dev->lock);
diff --git a/drivers/s390/crypto/ap_bus.h b/drivers/s390/crypto/ap_bus.h
index d960a6309ee..726fc65809d 100644
--- a/drivers/s390/crypto/ap_bus.h
+++ b/drivers/s390/crypto/ap_bus.h
@@ -136,9 +136,6 @@ struct ap_driver {
 
         int (*probe)(struct ap_device *);
         void (*remove)(struct ap_device *);
-        /* receive is called from tasklet context */
-        void (*receive)(struct ap_device *, struct ap_message *,
-                        struct ap_message *);
         int request_timeout;            /* request timeout in jiffies */
 };
 
@@ -183,6 +180,9 @@ struct ap_message {
 
         void *private;                  /* ap driver private pointer. */
         unsigned int special:1;         /* Used for special commands. */
+        /* receive is called from tasklet context */
+        void (*receive)(struct ap_device *, struct ap_message *,
+                        struct ap_message *);
 };
 
 #define AP_DEVICE(dt)                                   \
@@ -199,6 +199,7 @@ static inline void ap_init_message(struct ap_message *ap_msg)
         ap_msg->psmid = 0;
         ap_msg->length = 0;
         ap_msg->special = 0;
+        ap_msg->receive = NULL;
 }
 
 /*
diff --git a/drivers/s390/crypto/zcrypt_cex2a.c b/drivers/s390/crypto/zcrypt_cex2a.c
index 08428672816..46812440425 100644
--- a/drivers/s390/crypto/zcrypt_cex2a.c
+++ b/drivers/s390/crypto/zcrypt_cex2a.c
@@ -77,7 +77,6 @@ static void zcrypt_cex2a_receive(struct ap_device *, struct ap_message *,
 static struct ap_driver zcrypt_cex2a_driver = {
         .probe = zcrypt_cex2a_probe,
         .remove = zcrypt_cex2a_remove,
-        .receive = zcrypt_cex2a_receive,
         .ids = zcrypt_cex2a_ids,
         .request_timeout = CEX2A_CLEANUP_TIME,
 };
@@ -349,6 +348,7 @@ static long zcrypt_cex2a_modexpo(struct zcrypt_device *zdev,
                 ap_msg.message = kmalloc(CEX3A_MAX_MESSAGE_SIZE, GFP_KERNEL);
         if (!ap_msg.message)
                 return -ENOMEM;
+        ap_msg.receive = zcrypt_cex2a_receive;
         ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
                                 atomic_inc_return(&zcrypt_step);
         ap_msg.private = &work;
@@ -390,6 +390,7 @@ static long zcrypt_cex2a_modexpo_crt(struct zcrypt_device *zdev,
                 ap_msg.message = kmalloc(CEX3A_MAX_MESSAGE_SIZE, GFP_KERNEL);
         if (!ap_msg.message)
                 return -ENOMEM;
+        ap_msg.receive = zcrypt_cex2a_receive;
         ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
                                 atomic_inc_return(&zcrypt_step);
         ap_msg.private = &work;
diff --git a/drivers/s390/crypto/zcrypt_pcica.c b/drivers/s390/crypto/zcrypt_pcica.c
index 0effca92545..ad7951c21b7 100644
--- a/drivers/s390/crypto/zcrypt_pcica.c
+++ b/drivers/s390/crypto/zcrypt_pcica.c
@@ -67,7 +67,6 @@ static void zcrypt_pcica_receive(struct ap_device *, struct ap_message *,
 static struct ap_driver zcrypt_pcica_driver = {
         .probe = zcrypt_pcica_probe,
         .remove = zcrypt_pcica_remove,
-        .receive = zcrypt_pcica_receive,
         .ids = zcrypt_pcica_ids,
         .request_timeout = PCICA_CLEANUP_TIME,
 };
@@ -284,6 +283,7 @@ static long zcrypt_pcica_modexpo(struct zcrypt_device *zdev,
         ap_msg.message = kmalloc(PCICA_MAX_MESSAGE_SIZE, GFP_KERNEL);
         if (!ap_msg.message)
                 return -ENOMEM;
+        ap_msg.receive = zcrypt_pcica_receive;
         ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
                                 atomic_inc_return(&zcrypt_step);
         ap_msg.private = &work;
@@ -322,6 +322,7 @@ static long zcrypt_pcica_modexpo_crt(struct zcrypt_device *zdev,
         ap_msg.message = kmalloc(PCICA_MAX_MESSAGE_SIZE, GFP_KERNEL);
         if (!ap_msg.message)
                 return -ENOMEM;
+        ap_msg.receive = zcrypt_pcica_receive;
         ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
                                 atomic_inc_return(&zcrypt_step);
         ap_msg.private = &work;
diff --git a/drivers/s390/crypto/zcrypt_pcicc.c b/drivers/s390/crypto/zcrypt_pcicc.c
index f9523c0cc8d..e5dd335fda5 100644
--- a/drivers/s390/crypto/zcrypt_pcicc.c
+++ b/drivers/s390/crypto/zcrypt_pcicc.c
@@ -79,7 +79,6 @@ static void zcrypt_pcicc_receive(struct ap_device *, struct ap_message *,
 static struct ap_driver zcrypt_pcicc_driver = {
         .probe = zcrypt_pcicc_probe,
         .remove = zcrypt_pcicc_remove,
-        .receive = zcrypt_pcicc_receive,
         .ids = zcrypt_pcicc_ids,
         .request_timeout = PCICC_CLEANUP_TIME,
 };
@@ -488,6 +487,7 @@ static long zcrypt_pcicc_modexpo(struct zcrypt_device *zdev,
         ap_msg.message = (void *) get_zeroed_page(GFP_KERNEL);
         if (!ap_msg.message)
                 return -ENOMEM;
+        ap_msg.receive = zcrypt_pcicc_receive;
         ap_msg.length = PAGE_SIZE;
         ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
                                 atomic_inc_return(&zcrypt_step);
@@ -527,6 +527,7 @@ static long zcrypt_pcicc_modexpo_crt(struct zcrypt_device *zdev,
         ap_msg.message = (void *) get_zeroed_page(GFP_KERNEL);
         if (!ap_msg.message)
                 return -ENOMEM;
+        ap_msg.receive = zcrypt_pcicc_receive;
         ap_msg.length = PAGE_SIZE;
         ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
                                 atomic_inc_return(&zcrypt_step);
diff --git a/drivers/s390/crypto/zcrypt_pcixcc.c b/drivers/s390/crypto/zcrypt_pcixcc.c
index cf1cbd4747f..f7cc4340181 100644
--- a/drivers/s390/crypto/zcrypt_pcixcc.c
+++ b/drivers/s390/crypto/zcrypt_pcixcc.c
@@ -89,7 +89,6 @@ static void zcrypt_pcixcc_receive(struct ap_device *, struct ap_message *,
 static struct ap_driver zcrypt_pcixcc_driver = {
         .probe = zcrypt_pcixcc_probe,
         .remove = zcrypt_pcixcc_remove,
-        .receive = zcrypt_pcixcc_receive,
         .ids = zcrypt_pcixcc_ids,
         .request_timeout = PCIXCC_CLEANUP_TIME,
 };
@@ -698,6 +697,7 @@ static long zcrypt_pcixcc_modexpo(struct zcrypt_device *zdev,
         ap_msg.message = (void *) get_zeroed_page(GFP_KERNEL);
         if (!ap_msg.message)
                 return -ENOMEM;
+        ap_msg.receive = zcrypt_pcixcc_receive;
         ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
                                 atomic_inc_return(&zcrypt_step);
         ap_msg.private = &resp_type;
@@ -738,6 +738,7 @@ static long zcrypt_pcixcc_modexpo_crt(struct zcrypt_device *zdev,
         ap_msg.message = (void *) get_zeroed_page(GFP_KERNEL);
         if (!ap_msg.message)
                 return -ENOMEM;
+        ap_msg.receive = zcrypt_pcixcc_receive;
         ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
                                 atomic_inc_return(&zcrypt_step);
         ap_msg.private = &resp_type;
@@ -778,6 +779,7 @@ static long zcrypt_pcixcc_send_cprb(struct zcrypt_device *zdev,
         ap_msg.message = kmalloc(PCIXCC_MAX_XCRB_MESSAGE_SIZE, GFP_KERNEL);
         if (!ap_msg.message)
                 return -ENOMEM;
+        ap_msg.receive = zcrypt_pcixcc_receive;
         ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
                                 atomic_inc_return(&zcrypt_step);
         ap_msg.private = &resp_type;
@@ -818,6 +820,7 @@ static long zcrypt_pcixcc_rng(struct zcrypt_device *zdev,
         ap_msg.message = kmalloc(PCIXCC_MAX_XCRB_MESSAGE_SIZE, GFP_KERNEL);
         if (!ap_msg.message)
                 return -ENOMEM;
+        ap_msg.receive = zcrypt_pcixcc_receive;
         ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
                                 atomic_inc_return(&zcrypt_step);
         ap_msg.private = &resp_type;