diff options
| author | Giridhar Malavali <giridhar.malavali@qlogic.com> | 2012-04-25 16:26:14 +0200 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-05-10 09:10:58 +0200 |
| commit | a49393f2ae13e3a0c61dbdbea77c2ff7614df474 (patch) | |
| tree | efe0cbeb4d55a0dea42ffc9aa03430376d9ab3c9 /drivers | |
| parent | [SCSI] qla2xxx: Fix reset time out as qla2xxx not ack to reset request. (diff) | |
| download | linux-a49393f2ae13e3a0c61dbdbea77c2ff7614df474.tar.xz linux-a49393f2ae13e3a0c61dbdbea77c2ff7614df474.zip | |
[SCSI] qla2xxx: Block flash access from application when device is initialized for ISP82xx.
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_bsg.c | 3 | ||||
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_sup.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c index f74cc0602f3b..bc3cc6d91117 100644 --- a/drivers/scsi/qla2xxx/qla_bsg.c +++ b/drivers/scsi/qla2xxx/qla_bsg.c @@ -1367,6 +1367,9 @@ qla2x00_read_optrom(struct fc_bsg_job *bsg_job) struct qla_hw_data *ha = vha->hw; int rval = 0; + if (ha->flags.isp82xx_reset_hdlr_active) + return -EBUSY; + rval = qla2x00_optrom_setup(bsg_job, vha, 0); if (rval) return rval; diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c index 3c13c0a6be63..a683e766d1ae 100644 --- a/drivers/scsi/qla2xxx/qla_sup.c +++ b/drivers/scsi/qla2xxx/qla_sup.c @@ -1017,6 +1017,9 @@ qla2xxx_flash_npiv_conf(scsi_qla_host_t *vha) !IS_CNA_CAPABLE(ha) && !IS_QLA2031(ha)) return; + if (ha->flags.isp82xx_reset_hdlr_active) + return; + ha->isp_ops->read_optrom(vha, (uint8_t *)&hdr, ha->flt_region_npiv_conf << 2, sizeof(struct qla_npiv_header)); if (hdr.version == __constant_cpu_to_le16(0xffff)) |