From: Chad Dupuis Date: Fri, 8 Feb 2013 06:57:46 +0000 (-0500) Subject: [SCSI] qla2xxx: Reject loopback request if one is already in progress. X-Git-Tag: upstream/snapshot3+hdmi~5590^2~46 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1bcc46cb74d3ba7471eac57af8931ca1a03e7b36;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git [SCSI] qla2xxx: Reject loopback request if one is already in progress. If another function on the port has initiated a loopback operation do not process the current request. Signed-off-by: Chad Dupuis Signed-off-by: Saurav Kashyap Signed-off-by: James Bottomley --- diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c index f7cb6a3..5b49766 100644 --- a/drivers/scsi/qla2xxx/qla_bsg.c +++ b/drivers/scsi/qla2xxx/qla_bsg.c @@ -746,6 +746,14 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job) goto done_free_dma_rsp; } + if ((config[0] & INTERNAL_LOOPBACK_MASK) != 0) { + ql_dbg(ql_dbg_user, vha, 0x70c4, + "Loopback operation already in " + "progress.\n"); + rval = -EAGAIN; + goto done_free_dma_rsp; + } + ql_dbg(ql_dbg_user, vha, 0x70c0, "elreq.options=%04x\n", elreq.options); diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c index af045ed..c1d2310 100644 --- a/drivers/scsi/qla2xxx/qla_dbg.c +++ b/drivers/scsi/qla2xxx/qla_dbg.c @@ -24,7 +24,7 @@ * | Async Events | 0x5071 | 0x502b-0x502f | * | | | 0x5047,0x5052 | * | Timer Routines | 0x6011 | | - * | User Space Interactions | 0x70c3 | 0x7018,0x702e, | + * | User Space Interactions | 0x70c4 | 0x7018,0x702e, | * | | | 0x7020,0x7024, | * | | | 0x7039,0x7045, | * | | | 0x7073-0x7075, |