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

Commit 85880801 authored Dec 15, 2009 by Andrew Vasquez Committed by James Bottomley Dec 30, 2009

[SCSI] qla2xxx: Extend base EEH support in qla2xxx.



Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

parent 5c66f5d1

drivers/scsi/qla2xxx/qla_attr.c

+27 −5

Original line number	Diff line number	Diff line
		@@ -232,6 +232,9 @@ qla2x00_sysfs_write_optrom_ctl(struct kobject *kobj,
		if (off)
		return 0;

		if (unlikely(pci_channel_offline(ha->pdev)))
		return 0;

		if (sscanf(buf, "%d:%x:%x", &val, &start, &size) < 1)
		return -EINVAL;
		if (start > ha->optrom_size)
		@@ -379,6 +382,9 @@ qla2x00_sysfs_read_vpd(struct kobject *kobj,
		struct device, kobj)));
		struct qla_hw_data *ha = vha->hw;

		if (unlikely(pci_channel_offline(ha->pdev)))
		return 0;

		if (!capable(CAP_SYS_ADMIN))
		return 0;

		@@ -398,6 +404,9 @@ qla2x00_sysfs_write_vpd(struct kobject *kobj,
		struct qla_hw_data *ha = vha->hw;
		uint8_t *tmp_data;

		if (unlikely(pci_channel_offline(ha->pdev)))
		return 0;

		if (!capable(CAP_SYS_ADMIN) \|\| off != 0 \|\| count != ha->vpd_size \|\|
		!ha->isp_ops->write_nvram)
		return 0;
		@@ -1238,9 +1247,10 @@ qla2x00_fw_state_show(struct device dev, struct device_attribute attr,
		char *buf)
		{
		scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
		int rval;
		int rval = QLA_FUNCTION_FAILED;
		uint16_t state[5];

		if (!vha->hw->flags.eeh_busy)
		rval = qla2x00_get_firmware_state(vha, state);
		if (rval != QLA_SUCCESS)
		memset(state, -1, sizeof(state));
		@@ -1452,10 +1462,13 @@ qla2x00_dev_loss_tmo_callbk(struct fc_rport *rport)
		if (!fcport)
		return;

		if (unlikely(pci_channel_offline(fcport->vha->hw->pdev)))
		if (test_bit(ABORT_ISP_ACTIVE, &fcport->vha->dpc_flags))
		return;

		if (unlikely(pci_channel_offline(fcport->vha->hw->pdev))) {
		qla2x00_abort_all_cmds(fcport->vha, DID_NO_CONNECT << 16);
		else
		qla2x00_abort_fcport_cmds(fcport);
		return;
		}

		/*
		* Transport has effectively 'deleted' the rport, clear
		@@ -1475,6 +1488,9 @@ qla2x00_terminate_rport_io(struct fc_rport *rport)
		if (!fcport)
		return;

		if (test_bit(ABORT_ISP_ACTIVE, &fcport->vha->dpc_flags))
		return;

		if (unlikely(pci_channel_offline(fcport->vha->hw->pdev))) {
		qla2x00_abort_all_cmds(fcport->vha, DID_NO_CONNECT << 16);
		return;
		@@ -1515,6 +1531,12 @@ qla2x00_get_fc_host_stats(struct Scsi_Host *shost)
		pfc_host_stat = &ha->fc_host_stat;
		memset(pfc_host_stat, -1, sizeof(struct fc_host_statistics));

		if (test_bit(UNLOADING, &vha->dpc_flags))
		goto done;

		if (unlikely(pci_channel_offline(ha->pdev)))
		goto done;

		stats = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &stats_dma);
		if (stats == NULL) {
		DEBUG2_3_11(printk("%s(%ld): Failed to allocate memory.\n",

drivers/scsi/qla2xxx/qla_dbg.h

+8 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@
		/* #define QL_DEBUG_LEVEL_14 / / Output RSCN trace msgs */
		/* #define QL_DEBUG_LEVEL_15 / / Output NPIV trace msgs */
		/* #define QL_DEBUG_LEVEL_16 / / Output ISP84XX trace msgs */
		/* #define QL_DEBUG_LEVEL_17 / / Output MULTI-Q trace messages */
		/* #define QL_DEBUG_LEVEL_17 / / Output EEH trace messages */

		/*
		* Macros use for debugging the driver.
		@@ -132,6 +132,13 @@
		#else
		#define DEBUG16(x) do {} while (0)
		#endif

		#if defined(QL_DEBUG_LEVEL_17)
		#define DEBUG17(x) do {x;} while (0)
		#else
		#define DEBUG17(x) do {} while (0)
		#endif

		/*
		* Firmware Dump structure definition
		*/

drivers/scsi/qla2xxx/qla_def.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -2256,11 +2256,13 @@ struct qla_hw_data {
		uint32_t disable_serdes :1;
		uint32_t gpsc_supported :1;
		uint32_t npiv_supported :1;
		uint32_t pci_channel_io_perm_failure :1;
		uint32_t fce_enabled :1;
		uint32_t fac_supported :1;
		uint32_t chip_reset_done :1;
		uint32_t port0 :1;
		uint32_t running_gold_fw :1;
		uint32_t eeh_busy :1;
		uint32_t cpu_affinity_enabled :1;
		uint32_t disable_msix_handshake :1;
		} flags;

drivers/scsi/qla2xxx/qla_init.c

+20 −0

Original line number	Diff line number	Diff line
		@@ -269,6 +269,8 @@ qla2x00_initialize_adapter(scsi_qla_host_t *vha)
		vha->flags.online = 0;
		ha->flags.chip_reset_done = 0;
		vha->flags.reset_active = 0;
		ha->flags.pci_channel_io_perm_failure = 0;
		ha->flags.eeh_busy = 0;
		atomic_set(&vha->loop_down_timer, LOOP_DOWN_TIME);
		atomic_set(&vha->loop_state, LOOP_DOWN);
		vha->device_flags = DFLG_NO_CABLE;
		@@ -581,6 +583,9 @@ qla2x00_reset_chip(scsi_qla_host_t *vha)
		uint32_t cnt;
		uint16_t cmd;

		if (unlikely(pci_channel_offline(ha->pdev)))
		return;

		ha->isp_ops->disable_intrs(ha);

		spin_lock_irqsave(&ha->hardware_lock, flags);
		@@ -786,6 +791,12 @@ void
		qla24xx_reset_chip(scsi_qla_host_t *vha)
		{
		struct qla_hw_data *ha = vha->hw;

		if (pci_channel_offline(ha->pdev) &&
		ha->flags.pci_channel_io_perm_failure) {
		return;
		}

		ha->isp_ops->disable_intrs(ha);

		/* Perform RISC reset. */
		@@ -3562,6 +3573,13 @@ qla2x00_abort_isp(scsi_qla_host_t *vha)
		/* Requeue all commands in outstanding command list. */
		qla2x00_abort_all_cmds(vha, DID_RESET << 16);

		if (unlikely(pci_channel_offline(ha->pdev) &&
		ha->flags.pci_channel_io_perm_failure)) {
		clear_bit(ISP_ABORT_RETRY, &vha->dpc_flags);
		status = 0;
		return status;
		}

		ha->isp_ops->get_flash_version(vha, req->ring);

		ha->isp_ops->nvram_config(vha);
		@@ -4460,6 +4478,8 @@ qla2x00_try_to_stop_firmware(scsi_qla_host_t *vha)
		int ret, retries;
		struct qla_hw_data *ha = vha->hw;

		if (ha->flags.pci_channel_io_perm_failure)
		return;
		if (!IS_FWI2_CAPABLE(ha))
		return;
		if (!ha->fw_major_version)

drivers/scsi/qla2xxx/qla_isr.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -152,7 +152,7 @@ qla2300_intr_handler(int irq, void *dev_id)
		for (iter = 50; iter--; ) {
		stat = RD_REG_DWORD(&reg->u.isp2300.host_status);
		if (stat & HSR_RISC_PAUSED) {
		if (pci_channel_offline(ha->pdev))
		if (unlikely(pci_channel_offline(ha->pdev)))
		break;

		hccr = RD_REG_WORD(&reg->hccr);
		@@ -1846,12 +1846,15 @@ qla24xx_intr_handler(int irq, void *dev_id)
		reg = &ha->iobase->isp24;
		status = 0;

		if (unlikely(pci_channel_offline(ha->pdev)))
		return IRQ_HANDLED;

		spin_lock_irqsave(&ha->hardware_lock, flags);
		vha = pci_get_drvdata(ha->pdev);
		for (iter = 50; iter--; ) {
		stat = RD_REG_DWORD(&reg->host_status);
		if (stat & HSRX_RISC_PAUSED) {
		if (pci_channel_offline(ha->pdev))
		if (unlikely(pci_channel_offline(ha->pdev)))
		break;

		hccr = RD_REG_DWORD(&reg->hccr);
		@@ -1992,7 +1995,7 @@ qla24xx_msix_default(int irq, void *dev_id)
		do {
		stat = RD_REG_DWORD(&reg->host_status);
		if (stat & HSRX_RISC_PAUSED) {
		if (pci_channel_offline(ha->pdev))
		if (unlikely(pci_channel_offline(ha->pdev)))
		break;

		hccr = RD_REG_DWORD(&reg->hccr);