Skip to content

Commit 670106e

Browse files
tyreldmartinkpetersen
authored andcommitted
scsi: ibmvfc: Fix erroneous use of rtas_busy_delay with hcall return code
Commit 0217a27 ("scsi: ibmvfc: Store return code of H_FREE_SUB_CRQ during cleanup") wrongly changed the busy loop check to use rtas_busy_delay() instead of H_BUSY and H_IS_LONG_BUSY(). The busy return codes for RTAS and hypercalls are not the same. Fix this issue by restoring the use of H_BUSY and H_IS_LONG_BUSY(). Fixes: 0217a27 ("scsi: ibmvfc: Store return code of H_FREE_SUB_CRQ during cleanup") Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com> Link: https://lore.kernel.org/r/20230921225435.3537728-5-tyreld@linux.ibm.com Reviewed-by: Brian King <brking@linux.vnet.ibm.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent b27bce7 commit 670106e

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

drivers/scsi/ibmvscsi/ibmvfc.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include <linux/bsg-lib.h>
2323
#include <asm/firmware.h>
2424
#include <asm/irq.h>
25-
#include <asm/rtas.h>
2625
#include <asm/vio.h>
2726
#include <scsi/scsi.h>
2827
#include <scsi/scsi_cmnd.h>
@@ -5952,7 +5951,7 @@ static int ibmvfc_register_scsi_channel(struct ibmvfc_host *vhost,
59525951
irq_failed:
59535952
do {
59545953
rc = plpar_hcall_norets(H_FREE_SUB_CRQ, vdev->unit_address, scrq->cookie);
5955-
} while (rtas_busy_delay(rc));
5954+
} while (rc == H_BUSY || H_IS_LONG_BUSY(rc));
59565955
reg_failed:
59575956
LEAVE;
59585957
return rc;

0 commit comments

Comments
 (0)