s390/vfio_ap: verify ZAPQ completion after return of response code zero

Verification that the asynchronous ZAPQ function has completed only needs
to be done when the response code indicates the function was successfully
initiated; so, let's call the apq_reset_check function immediately after
the response code zero is returned from the ZAPQ.

Signed-off-by: Tony Krowiak <akrowiak@linux.ibm.com>
Reviewed-by: Jason J. Herne <jjherne@linux.ibm.com>
Reviewed-by: Harald Freudenberger <freude@linux.ibm.com>
Link: https://lore.kernel.org/r/20230118203111.529766-5-akrowiak@linux.ibm.com
Signed-off-by: Christian Borntraeger <borntraeger@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

diff --git a/drivers/s390/crypto/vfio_ap_ops.c b/drivers/s390/crypto/vfio_ap_ops.c
index bc9a814e6508cee45f0a8bade304ea751911531e..6ed9fe77793ea06337d9aa342df8ec68bbf2815c 100644 (file)
--- a/drivers/s390/crypto/vfio_ap_ops.c
+++ b/drivers/s390/crypto/vfio_ap_ops.c
@@ -1656,6 +1656,9 @@ retry_zapq:
        switch (status.response_code) {
        case AP_RESPONSE_NORMAL:
                ret = 0;
+               /* if the reset has not completed, wait for it to take effect */
+               if (!status.queue_empty || status.irq_enabled)
+                       ret = apq_reset_check(q);
                break;
        case AP_RESPONSE_RESET_IN_PROGRESS:
                /*
@@ -1685,10 +1688,6 @@ retry_zapq:
                return -EIO;
        }
 
-       /* wait for the reset to take effect */
-       if (!(status.queue_empty && !status.irq_enabled))
-               ret = apq_reset_check(q);
-
 free_resources:
        vfio_ap_free_aqic_resources(q);