Commit 66a0d59c authored by Brian King's avatar Brian King Committed by Martin K. Petersen
Browse files

scsi: ipr: Fix missed EH wakeup 



Following a command abort or device reset, ipr's EH handlers wait for
the commands getting aborted to get sent back from the adapter prior to
returning from the EH handler. This fixes up some cases where the
completion handler was not getting called, which would have resulted in
the EH thread waiting until it timed out, greatly extending EH time.

Signed-off-by: default avatarBrian King <brking@linux.vnet.ibm.com>
Reviewed-by: default avatarWendy Xiong <wenxiong@linux.vnet.ibm.com>
Tested-by: default avatarWendy Xiong <wenxiong@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 4935933e

drivers/scsi/ipr.c

+12 −4
Original line number Diff line number Diff line
@@ -836,8 +836,10 @@ static void ipr_sata_eh_done(struct ipr_cmnd *ipr_cmd) 


	qc->err_mask |= AC_ERR_OTHER;

	sata_port->ioasa.status |= ATA_BUSY;

	list_add_tail(&ipr_cmd->queue, &ipr_cmd->hrrq->hrrq_free_q);

	ata_qc_complete(qc);

	if (ipr_cmd->eh_comp)

		complete(ipr_cmd->eh_comp);

	list_add_tail(&ipr_cmd->queue, &ipr_cmd->hrrq->hrrq_free_q);

}



/**
@@ -5947,8 +5949,10 @@ static void ipr_erp_done(struct ipr_cmnd *ipr_cmd) 
		res->in_erp = 0;

	}

	scsi_dma_unmap(ipr_cmd->scsi_cmd);

	list_add_tail(&ipr_cmd->queue, &ipr_cmd->hrrq->hrrq_free_q);

	scsi_cmd->scsi_done(scsi_cmd);

	if (ipr_cmd->eh_comp)

		complete(ipr_cmd->eh_comp);

	list_add_tail(&ipr_cmd->queue, &ipr_cmd->hrrq->hrrq_free_q);

}



/**
@@ -6338,8 +6342,10 @@ static void ipr_erp_start(struct ipr_ioa_cfg *ioa_cfg, 
	}



	scsi_dma_unmap(ipr_cmd->scsi_cmd);

	list_add_tail(&ipr_cmd->queue, &ipr_cmd->hrrq->hrrq_free_q);

	scsi_cmd->scsi_done(scsi_cmd);

	if (ipr_cmd->eh_comp)

		complete(ipr_cmd->eh_comp);

	list_add_tail(&ipr_cmd->queue, &ipr_cmd->hrrq->hrrq_free_q);

}



/**
@@ -6365,8 +6371,10 @@ static void ipr_scsi_done(struct ipr_cmnd *ipr_cmd) 
		scsi_dma_unmap(scsi_cmd);



		spin_lock_irqsave(ipr_cmd->hrrq->lock, lock_flags);

		list_add_tail(&ipr_cmd->queue, &ipr_cmd->hrrq->hrrq_free_q);

		scsi_cmd->scsi_done(scsi_cmd);

		if (ipr_cmd->eh_comp)

			complete(ipr_cmd->eh_comp);

		list_add_tail(&ipr_cmd->queue, &ipr_cmd->hrrq->hrrq_free_q);

		spin_unlock_irqrestore(ipr_cmd->hrrq->lock, lock_flags);

	} else {

		spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);

CRA Git | Maintained and supported by SUSTech CRA and CCSE