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

This project is archived. Its data is read-only.

Commit 33693c7a authored Aug 22, 2012 by Vikas Chaudhary Committed by James Bottomley Sep 24, 2012

[SCSI] qla4xxx: Added new functions in isp_ops



Signed-off-by: Poornima Vonti <poornima.vonti@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

parent c38fa3ab

drivers/scsi/qla4xxx/ql4_attr.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -75,13 +75,13 @@ qla4_8xxx_sysfs_write_fw_dump(struct file filep, struct kobject kobj,
		break;
		case 2:
		/* Reset HBA */
		qla4_82xx_idc_lock(ha);
		dev_state = qla4_82xx_rd_32(ha, QLA82XX_CRB_DEV_STATE);
		ha->isp_ops->idc_lock(ha);
		dev_state = qla4_8xxx_rd_direct(ha, QLA8XXX_CRB_DEV_STATE);
		if (dev_state == QLA8XXX_DEV_READY) {
		ql4_printk(KERN_INFO, ha,
		"%s: Setting Need reset, reset_owner is 0x%x.\n",
		__func__, ha->func_num);
		qla4_82xx_wr_32(ha, QLA82XX_CRB_DEV_STATE,
		qla4_8xxx_wr_direct(ha, QLA8XXX_CRB_DEV_STATE,
		QLA8XXX_DEV_NEED_RESET);
		set_bit(AF_8XXX_RST_OWNER, &ha->flags);
		} else
		@@ -89,7 +89,7 @@ qla4_8xxx_sysfs_write_fw_dump(struct file filep, struct kobject kobj,
		"%s: Reset not performed as device state is 0x%x\n",
		__func__, dev_state);

		qla4_82xx_idc_unlock(ha);
		ha->isp_ops->idc_unlock(ha);
		break;
		default:
		/* do nothing */

drivers/scsi/qla4xxx/ql4_def.h

+27 −0

Original line number	Diff line number	Diff line
		@@ -388,8 +388,10 @@ struct isp_operations {
		void (disable_intrs) (struct scsi_qla_host );
		void (enable_intrs) (struct scsi_qla_host );
		int (start_firmware) (struct scsi_qla_host );
		int (restart_firmware) (struct scsi_qla_host );
		irqreturn_t (intr_handler) (int , void );
		void (interrupt_service_routine) (struct scsi_qla_host , uint32_t);
		int (need_reset) (struct scsi_qla_host );
		int (reset_chip) (struct scsi_qla_host );
		int (reset_firmware) (struct scsi_qla_host );
		void (queue_iocb) (struct scsi_qla_host );
		@@ -397,6 +399,15 @@ struct isp_operations {
		uint16_t (rd_shdw_req_q_out) (struct scsi_qla_host );
		uint16_t (rd_shdw_rsp_q_in) (struct scsi_qla_host );
		int (get_sys_info) (struct scsi_qla_host );
		uint32_t (rd_reg_direct) (struct scsi_qla_host , ulong);
		void (wr_reg_direct) (struct scsi_qla_host , ulong, uint32_t);
		int (rd_reg_indirect) (struct scsi_qla_host , uint32_t, uint32_t *);
		int (wr_reg_indirect) (struct scsi_qla_host , uint32_t, uint32_t);
		int (idc_lock) (struct scsi_qla_host );
		void (idc_unlock) (struct scsi_qla_host );
		void (rom_lock_recovery) (struct scsi_qla_host );
		void (queue_mailbox_command) (struct scsi_qla_host , uint32_t *, int);
		void (process_mailbox_interrupt) (struct scsi_qla_host , int);
		};

		struct ql4_mdump_size_table {
		@@ -733,6 +744,8 @@ struct scsi_qla_host {
		#define MAX_MRB 128
		struct mrb *active_mrb_array[MAX_MRB];
		uint32_t mrb_index;

		uint32_t *reg_tbl;
		};

		struct ql4_task_data {
		@@ -942,6 +955,20 @@ static inline int ql4xxx_reset_active(struct scsi_qla_host *ha)
		test_bit(DPC_HA_UNRECOVERABLE, &ha->dpc_flags);

		}

		static inline int qla4_8xxx_rd_direct(struct scsi_qla_host *ha,
		const uint32_t crb_reg)
		{
		return ha->isp_ops->rd_reg_direct(ha, ha->reg_tbl[crb_reg]);
		}

		static inline void qla4_8xxx_wr_direct(struct scsi_qla_host *ha,
		const uint32_t crb_reg,
		const uint32_t value)
		{
		ha->isp_ops->wr_reg_direct(ha, ha->reg_tbl[crb_reg], value);
		}

		/---------------------------------------------------------------------------/

		/* Defines for qla4xxx_initialize_adapter() and qla4xxx_recover_adapter() */

drivers/scsi/qla4xxx/ql4_glbl.h

+12 −1

Original line number	Diff line number	Diff line
		@@ -117,7 +117,7 @@ int qla4_82xx_crb_win_lock(struct scsi_qla_host *);
		void qla4_82xx_crb_win_unlock(struct scsi_qla_host *);
		int qla4_82xx_pci_get_crb_addr_2M(struct scsi_qla_host , ulong );
		void qla4_82xx_wr_32(struct scsi_qla_host *, ulong, u32);
		int qla4_82xx_rd_32(struct scsi_qla_host *, ulong);
		uint32_t qla4_82xx_rd_32(struct scsi_qla_host *, ulong);
		int qla4_82xx_pci_mem_read_2M(struct scsi_qla_host , u64, void , int);
		int qla4_82xx_pci_mem_write_2M(struct scsi_qla_host ha, u64, void , int);
		int qla4_82xx_isp_reset(struct scsi_qla_host *ha);
		@@ -203,6 +203,17 @@ int qla4xxx_req_template_size(struct scsi_qla_host *ha);
		void qla4_8xxx_alloc_sysfs_attr(struct scsi_qla_host *ha);
		void qla4_8xxx_free_sysfs_attr(struct scsi_qla_host *ha);
		void qla4xxx_alloc_fw_dump(struct scsi_qla_host *ha);
		int qla4_82xx_try_start_fw(struct scsi_qla_host *ha);
		int qla4_8xxx_need_reset(struct scsi_qla_host *ha);
		int qla4_82xx_md_rd_32(struct scsi_qla_host ha, uint32_t off, uint32_t data);
		int qla4_82xx_md_wr_32(struct scsi_qla_host *ha, uint32_t off, uint32_t data);
		void qla4_82xx_rom_lock_recovery(struct scsi_qla_host *ha);
		void qla4_82xx_queue_mbox_cmd(struct scsi_qla_host ha, uint32_t mbx_cmd,
		int incount);
		void qla4_82xx_process_mbox_intr(struct scsi_qla_host *ha, int outcount);
		void qla4xxx_queue_mbox_cmd(struct scsi_qla_host ha, uint32_t mbx_cmd,
		int incount);
		void qla4xxx_process_mbox_intr(struct scsi_qla_host *ha, int outcount);

		extern int ql4xextended_error_logging;
		extern int ql4xdontresethba;

drivers/scsi/qla4xxx/ql4_mbx.c

+37 −59

Original line number	Diff line number	Diff line
		@@ -10,6 +10,37 @@
		#include "ql4_dbg.h"
		#include "ql4_inline.h"

		void qla4xxx_queue_mbox_cmd(struct scsi_qla_host ha, uint32_t mbx_cmd,
		int in_count)
		{
		int i;

		/* Load all mailbox registers, except mailbox 0. */
		for (i = 1; i < in_count; i++)
		writel(mbx_cmd[i], &ha->reg->mailbox[i]);

		/* Wakeup firmware */
		writel(mbx_cmd[0], &ha->reg->mailbox[0]);
		readl(&ha->reg->mailbox[0]);
		writel(set_rmask(CSR_INTR_RISC), &ha->reg->ctrl_status);
		readl(&ha->reg->ctrl_status);
		}

		void qla4xxx_process_mbox_intr(struct scsi_qla_host *ha, int out_count)
		{
		int intr_status;

		intr_status = readl(&ha->reg->ctrl_status);
		if (intr_status & INTR_PENDING) {
		/*
		* Service the interrupt.
		* The ISR will save the mailbox status registers
		* to a temporary storage location in the adapter structure.
		*/
		ha->mbox_status_count = out_count;
		ha->isp_ops->interrupt_service_routine(ha, intr_status);
		}
		}

		/**
		* qla4xxx_mailbox_command - issues mailbox commands
		@@ -30,7 +61,6 @@ int qla4xxx_mailbox_command(struct scsi_qla_host *ha, uint8_t inCount,
		int status = QLA_ERROR;
		uint8_t i;
		u_long wait_count;
		uint32_t intr_status;
		unsigned long flags = 0;
		uint32_t dev_state;

		@@ -85,9 +115,9 @@ int qla4xxx_mailbox_command(struct scsi_qla_host *ha, uint8_t inCount,
		goto mbox_exit;
		}
		/* Do not send any mbx cmd if h/w is in failed state*/
		qla4_82xx_idc_lock(ha);
		dev_state = qla4_82xx_rd_32(ha, QLA82XX_CRB_DEV_STATE);
		qla4_82xx_idc_unlock(ha);
		ha->isp_ops->idc_lock(ha);
		dev_state = qla4_8xxx_rd_direct(ha, QLA8XXX_CRB_DEV_STATE);
		ha->isp_ops->idc_unlock(ha);
		if (dev_state == QLA8XXX_DEV_FAILED) {
		ql4_printk(KERN_WARNING, ha,
		"scsi%ld: %s: H/W is in failed state, do not send any mailbox commands\n",
		@@ -102,30 +132,8 @@ int qla4xxx_mailbox_command(struct scsi_qla_host *ha, uint8_t inCount,
		for (i = 0; i < outCount; i++)
		ha->mbox_status[i] = 0;

		if (is_qla8022(ha)) {
		/* Load all mailbox registers, except mailbox 0. */
		DEBUG5(
		printk("scsi%ld: %s: Cmd ", ha->host_no, __func__);
		for (i = 0; i < inCount; i++)
		printk("mb%d=%04x ", i, mbx_cmd[i]);
		printk("\n"));

		for (i = 1; i < inCount; i++)
		writel(mbx_cmd[i], &ha->qla4_82xx_reg->mailbox_in[i]);
		writel(mbx_cmd[0], &ha->qla4_82xx_reg->mailbox_in[0]);
		readl(&ha->qla4_82xx_reg->mailbox_in[0]);
		writel(HINT_MBX_INT_PENDING, &ha->qla4_82xx_reg->hint);
		} else {
		/* Load all mailbox registers, except mailbox 0. */
		for (i = 1; i < inCount; i++)
		writel(mbx_cmd[i], &ha->reg->mailbox[i]);

		/* Wakeup firmware */
		writel(mbx_cmd[0], &ha->reg->mailbox[0]);
		readl(&ha->reg->mailbox[0]);
		writel(set_rmask(CSR_INTR_RISC), &ha->reg->ctrl_status);
		readl(&ha->reg->ctrl_status);
		}
		/* Queue the mailbox command to the firmware */
		ha->isp_ops->queue_mailbox_command(ha, mbx_cmd, inCount);

		spin_unlock_irqrestore(&ha->hardware_lock, flags);

		@@ -167,37 +175,7 @@ int qla4xxx_mailbox_command(struct scsi_qla_host *ha, uint8_t inCount,
		*/

		spin_lock_irqsave(&ha->hardware_lock, flags);
		if (is_qla8022(ha)) {
		intr_status =
		readl(&ha->qla4_82xx_reg->host_int);
		if (intr_status & ISRX_82XX_RISC_INT) {
		ha->mbox_status_count = outCount;
		intr_status =
		readl(&ha->qla4_82xx_reg->host_status);
		ha->isp_ops->interrupt_service_routine(
		ha, intr_status);
		if (test_bit(AF_INTERRUPTS_ON,
		&ha->flags) &&
		test_bit(AF_INTx_ENABLED,
		&ha->flags))
		qla4_82xx_wr_32(ha,
		ha->nx_legacy_intr.tgt_mask_reg,
		0xfbff);
		}
		} else {
		intr_status = readl(&ha->reg->ctrl_status);
		if (intr_status & INTR_PENDING) {
		/*
		* Service the interrupt.
		* The ISR will save the mailbox status
		* registers to a temporary storage
		* location in the adapter structure.
		*/
		ha->mbox_status_count = outCount;
		ha->isp_ops->interrupt_service_routine(
		ha, intr_status);
		}
		}
		ha->isp_ops->process_mailbox_interrupt(ha, outCount);
		spin_unlock_irqrestore(&ha->hardware_lock, flags);
		msleep(10);
		}

drivers/scsi/qla4xxx/ql4_nx.c

+164 −109

File changed.

Preview size limit exceeded, changes collapsed.