From: Igor Pylypiv <ipylypiv@xxxxxxxxxx>
It's possible to end up in a state where pm8001_dev->running_req never
reaches zero. In that state we will be sleeping forever.
sas_execute_internal_abort_dev() can wait for a response for
up to 60 seconds (3 retries x 20 seconds). 60 seconds should be enough
for pm8001_dev->running_req to get to zero.
Signed-off-by: Igor Pylypiv <ipylypiv@xxxxxxxxxx>
Signed-off-by: TJ Adams <tadamsjr@xxxxxxxxxx>
---
drivers/scsi/pm8001/pm8001_sas.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c
index a5a31dfa4512..513e9a49838c 100644
--- a/drivers/scsi/pm8001/pm8001_sas.c
+++ b/drivers/scsi/pm8001/pm8001_sas.c
@@ -712,8 +712,11 @@ static void pm8001_dev_gone_notify(struct domain_device *dev)
if (atomic_read(&pm8001_dev->running_req)) {
spin_unlock_irqrestore(&pm8001_ha->lock, flags);
sas_execute_internal_abort_dev(dev, 0, NULL);
- while (atomic_read(&pm8001_dev->running_req))
- msleep(20);
+ if (atomic_read(&pm8001_dev->running_req)) {
+ pm8001_dbg(pm8001_ha, FAIL,
+ "device_id: %u: Failed to abort %d requests!\n",
+ device_id, atomic_read(&pm8001_dev->running_req));
+ }
spin_lock_irqsave(&pm8001_ha->lock, flags);
}
PM8001_CHIP_DISP->dereg_dev_req(pm8001_ha, device_id);
--
2.45.2.803.g4e1b14247a-goog
