From: Holger Dengler <hd@linux.vnet.ibm.com>
Date: Mon, 2 Jul 2012 10:39:59 +0000 (+0200)
Subject: s390/ap: resend enable adapter interrupt request.
X-Git-Tag: next-20120724~102^2~7
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8738e07d5c9b5b02f113c7e0ba67f0d8d6a5b23c;p=karo-tx-linux.git

s390/ap: resend enable adapter interrupt request.

The adapter interrupt for an APQN must be re-enabled after a reset.
This patch sends the interrupt enablement request again, if the APQN
is busy or the reset is still in progress.

Signed-off-by: Holger Dengler <hd@linux.vnet.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
---

diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index b987d4619586..fa5f05c643cb 100644
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -338,6 +338,12 @@ static int ap_queue_enable_interruption(ap_qid_t qid, void *ind)
 			break;
 		case AP_RESPONSE_RESET_IN_PROGRESS:
 		case AP_RESPONSE_BUSY:
+			if (i < AP_MAX_RESET - 1) {
+				udelay(5);
+				status = ap_queue_interruption_control(qid,
+								       ind);
+				continue;
+			}
 			break;
 		case AP_RESPONSE_Q_NOT_AVAIL:
 		case AP_RESPONSE_DECONFIGURED: