From d2df919c8fabebc86c2f8962e724fa0dc39a5368 Mon Sep 17 00:00:00 2001

From: Tyrel Datwyler <tyreld@linux.ibm.com>

Date: Thu, 11 Feb 2021 12:57:41 -0600

Subject: [PATCH 3/4] ibmvfc: treat H_CLOSED as success during sub-CRQ

 registration

References: bsc#1182632 ltc#191222

Patch-mainline: submitted https://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=229197

A non-zero return code for H_REG_SUB_CRQ is currently treated as a

failure resulting in failing sub-CRQ setup. The case of H_CLOSED should

not be treated as a failure. This return code translates to a successful

sub-CRQ registration by the hypervisor, and is meant to communicate back

that there is currently no partner VIOS CRQ connection established as of

yet. This is a common occurrence during a disconnect where the client

adapter can possibly come back up prior to the partner adapter.

For non-zero return code from H_REG_SUB_CRQ treat a H_CLOSED as success

so that sub-CRQs are successfully setup.

Fixes: faacf8c5f1d5 ("ibmvfc: add alloc/dealloc routines for SCSI Sub-CRQ Channels")

Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>

Reviewed-by: Brian King <brking@linux.vnet.ibm.com>

Acked-by: Michal Suchanek <msuchanek@suse.de>

---

 drivers/scsi/ibmvscsi/ibmvfc.c | 3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c

index 5030e1e974e7..2e6f3524c6c6 100644

--- a/drivers/scsi/ibmvscsi/ibmvfc.c

+++ b/drivers/scsi/ibmvscsi/ibmvfc.c

@@ -5638,7 +5638,8 @@ static int ibmvfc_register_scsi_channel(struct ibmvfc_host *vhost,

 	rc = h_reg_sub_crq(vdev->unit_address, scrq->msg_token, PAGE_SIZE,

 			   &scrq->cookie, &scrq->hw_irq);

-	if (rc) {

+	/* H_CLOSED indicates successful register, but no CRQ partner */

+	if (rc && rc != H_CLOSED) {

 		dev_warn(dev, "Error registering sub-crq: %d\n", rc);

 		if (rc == H_PARAMETER)

 			dev_warn_once(dev, "Firmware may not support MQ\n");

-- 

2.26.2