Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d051a5aa authored Feb 09, 2012 by Andrew Vasquez Committed by James Bottomley Feb 18, 2012

[SCSI] qla2xxx: Add an "is reset active" helper.



Many locations within the driver would use an inconsistent set of
checks to determine ISP-reset state.  Consolidate the checks into
this inline-helper.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

parent aa651be8

drivers/scsi/qla2xxx/qla_attr.c

+4 −9

Original line number	Diff line number	Diff line
		@@ -1036,8 +1036,7 @@ qla2x00_link_state_show(struct device dev, struct device_attribute attr,
		vha->device_flags & DFLG_NO_CABLE)
		len = snprintf(buf, PAGE_SIZE, "Link Down\n");
		else if (atomic_read(&vha->loop_state) != LOOP_READY \|\|
		test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) \|\|
		test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags))
		qla2x00_reset_active(vha))
		len = snprintf(buf, PAGE_SIZE, "Unknown Link State\n");
		else {
		len = snprintf(buf, PAGE_SIZE, "Link Up - ");
		@@ -1359,8 +1358,7 @@ qla2x00_thermal_temp_show(struct device *dev,
		return snprintf(buf, PAGE_SIZE, "\n");

		temp = frac = 0;
		if (test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) \|\|
		test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags))
		if (qla2x00_reset_active(vha))
		ql_log(ql_log_warn, vha, 0x707b,
		"ISP reset active.\n");
		else if (!vha->hw->flags.eeh_busy)
		@@ -1379,8 +1377,7 @@ qla2x00_fw_state_show(struct device dev, struct device_attribute attr,
		int rval = QLA_FUNCTION_FAILED;
		uint16_t state[5];

		if (test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) \|\|
		test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags))
		if (qla2x00_reset_active(vha))
		ql_log(ql_log_warn, vha, 0x707c,
		"ISP reset active.\n");
		else if (!vha->hw->flags.eeh_busy)
		@@ -1693,9 +1690,7 @@ qla2x00_get_fc_host_stats(struct Scsi_Host *shost)
		if (IS_FWI2_CAPABLE(ha)) {
		rval = qla24xx_get_isp_stats(base_vha, stats, stats_dma);
		} else if (atomic_read(&base_vha->loop_state) == LOOP_READY &&
		!test_bit(ABORT_ISP_ACTIVE, &base_vha->dpc_flags) &&
		!test_bit(ISP_ABORT_NEEDED, &base_vha->dpc_flags) &&
		!ha->dpc_active) {
		!qla2x00_reset_active(vha) && !ha->dpc_active) {
		/* Must be in a 'READY' state for statistics retrieval. */
		rval = qla2x00_get_link_status(base_vha, base_vha->loop_id,
		stats, stats_dma);

drivers/scsi/qla2xxx/qla_bsg.c

+9 −41

Original line number	Diff line number	Diff line
		@@ -108,13 +108,6 @@ qla24xx_proc_fcp_prio_cfg_cmd(struct fc_bsg_job *bsg_job)
		goto exit_fcp_prio_cfg;
		}

		if (test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags) \|\|
		test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) \|\|
		test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) {
		ret = -EBUSY;
		goto exit_fcp_prio_cfg;
		}

		/* Get the sub command */
		oper = bsg_job->request->rqst_data.h_vendor.vendor_cmd[1];

		@@ -646,13 +639,6 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)
		dma_addr_t rsp_data_dma;
		uint32_t rsp_data_len;

		if (test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags) \|\|
		test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) \|\|
		test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) {
		ql_log(ql_log_warn, vha, 0x7018, "Abort active or needed.\n");
		return -EBUSY;
		}

		if (!vha->flags.online) {
		ql_log(ql_log_warn, vha, 0x7019, "Host is not online.\n");
		return -EIO;
		@@ -874,13 +860,6 @@ qla84xx_reset(struct fc_bsg_job *bsg_job)
		int rval = 0;
		uint32_t flag;

		if (test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags) \|\|
		test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) \|\|
		test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) {
		ql_log(ql_log_warn, vha, 0x702e, "Abort active or needed.\n");
		return -EBUSY;
		}

		if (!IS_QLA84XX(ha)) {
		ql_dbg(ql_dbg_user, vha, 0x702f, "Not 84xx, exiting.\n");
		return -EINVAL;
		@@ -922,11 +901,6 @@ qla84xx_updatefw(struct fc_bsg_job *bsg_job)
		uint32_t flag;
		uint32_t fw_ver;

		if (test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags) \|\|
		test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) \|\|
		test_bit(ISP_ABORT_RETRY, &vha->dpc_flags))
		return -EBUSY;

		if (!IS_QLA84XX(ha)) {
		ql_dbg(ql_dbg_user, vha, 0x7032,
		"Not 84xx, exiting.\n");
		@@ -1036,14 +1010,6 @@ qla84xx_mgmt_cmd(struct fc_bsg_job *bsg_job)
		uint32_t data_len = 0;
		uint32_t dma_direction = DMA_NONE;

		if (test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags) \|\|
		test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) \|\|
		test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) {
		ql_log(ql_log_warn, vha, 0x7039,
		"Abort active or needed.\n");
		return -EBUSY;
		}

		if (!IS_QLA84XX(ha)) {
		ql_log(ql_log_warn, vha, 0x703a,
		"Not 84xx, exiting.\n");
		@@ -1246,13 +1212,6 @@ qla24xx_iidma(struct fc_bsg_job *bsg_job)

		bsg_job->reply->reply_payload_rcv_len = 0;

		if (test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags) \|\|
		test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) \|\|
		test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) {
		ql_log(ql_log_warn, vha, 0x7045, "abort active or needed.\n");
		return -EBUSY;
		}

		if (!IS_IIDMA_CAPABLE(vha->hw)) {
		ql_log(ql_log_info, vha, 0x7046, "iiDMA not supported.\n");
		return -EINVAL;
		@@ -1668,6 +1627,15 @@ qla24xx_bsg_request(struct fc_bsg_job *bsg_job)
		vha = shost_priv(host);
		}

		if (qla2x00_reset_active(vha)) {
		ql_dbg(ql_dbg_user, vha, 0x709f,
		"BSG: ISP abort active/needed -- cmd=%d.\n",
		bsg_job->request->msgcode);
		bsg_job->reply->result = (DID_ERROR << 16);
		bsg_job->job_done(bsg_job);
		return -EBUSY;
		}

		ql_dbg(ql_dbg_user, vha, 0x7000,
		"Entered %s msgcode=0x%x.\n", __func__, bsg_job->request->msgcode);

drivers/scsi/qla2xxx/qla_dbg.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,8 @@
		* \| DPC Thread \| 0x401c \| \|
		* \| Async Events \| 0x5057 \| 0x5052 \|
		* \| Timer Routines \| 0x6011 \| 0x600e,0x600f \|
		* \| User Space Interactions \| 0x709e \| \|
		* \| User Space Interactions \| 0x709e \| 0x7018,0x702e \|
		* \| \| \| 0x7039,0x7045 \|
		* \| Task Management \| 0x803c \| 0x8025-0x8026 \|
		* \| \| \| 0x800b,0x8039 \|
		* \| AER/EEH \| 0x900f \| \|

drivers/scsi/qla2xxx/qla_inline.h

+13 −0

Original line number	Diff line number	Diff line
		@@ -131,3 +131,16 @@ qla2x00_hba_err_chk_enabled(srb_t *sp)
		}
		return 0;
		}

		static inline int
		qla2x00_reset_active(scsi_qla_host_t *vha)
		{
		scsi_qla_host_t *base_vha = pci_get_drvdata(vha->hw->pdev);

		/* Test appropriate base-vha and vha flags. */
		return test_bit(ISP_ABORT_NEEDED, &base_vha->dpc_flags) \|\|
		test_bit(ABORT_ISP_ACTIVE, &base_vha->dpc_flags) \|\|
		test_bit(ISP_ABORT_RETRY, &base_vha->dpc_flags) \|\|
		test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags) \|\|
		test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags);
		}