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

Commit 7ec0effd authored Aug 27, 2013 by Atul Deshmukh Committed by James Bottomley Sep 03, 2013

[SCSI] qla2xxx: Add support for ISP8044.



[jejb: checkpatch fixes]
Signed-off-by: Atul Deshmukh <atul.deshmukh@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

parent 7b833558

drivers/scsi/qla2xxx/Makefile

+1 −1

Original line number	Diff line number	Diff line
		qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \
		qla_dbg.o qla_sup.o qla_attr.o qla_mid.o qla_dfs.o qla_bsg.o \
		qla_nx.o qla_mr.o qla_target.o
		qla_nx.o qla_mr.o qla_nx2.o qla_target.o

		obj-$(CONFIG_SCSI_QLA_FC) += qla2xxx.o
		obj-$(CONFIG_TCM_QLA2XXX) += tcm_qla2xxx.o

drivers/scsi/qla2xxx/qla_attr.c

+21 −8

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@ qla2x00_sysfs_read_fw_dump(struct file filp, struct kobject kobj,
		if (!(ha->fw_dump_reading \|\| ha->mctp_dump_reading))
		return 0;

		if (IS_QLA82XX(ha)) {
		if (IS_P3P_TYPE(ha)) {
		if (off < ha->md_template_size) {
		rval = memory_read_from_buffer(buf, count,
		&off, ha->md_tmplt_hdr, ha->md_template_size);
		@@ -71,7 +71,7 @@ qla2x00_sysfs_write_fw_dump(struct file filp, struct kobject kobj,
		ql_log(ql_log_info, vha, 0x705d,
		"Firmware dump cleared on (%ld).\n", vha->host_no);

		if (IS_QLA82XX(vha->hw)) {
		if (IS_P3P_TYPE(ha)) {
		qla82xx_md_free(vha);
		qla82xx_md_prep(vha);
		}
		@@ -95,11 +95,15 @@ qla2x00_sysfs_write_fw_dump(struct file filp, struct kobject kobj,
		qla82xx_idc_lock(ha);
		qla82xx_set_reset_owner(vha);
		qla82xx_idc_unlock(ha);
		} else if (IS_QLA8044(ha)) {
		qla8044_idc_lock(ha);
		qla82xx_set_reset_owner(vha);
		qla8044_idc_unlock(ha);
		} else
		qla2x00_system_error(vha);
		break;
		case 4:
		if (IS_QLA82XX(ha)) {
		if (IS_P3P_TYPE(ha)) {
		if (ha->md_tmplt_hdr)
		ql_dbg(ql_dbg_user, vha, 0x705b,
		"MiniDump supported with this firmware.\n");
		@@ -109,7 +113,7 @@ qla2x00_sysfs_write_fw_dump(struct file filp, struct kobject kobj,
		}
		break;
		case 5:
		if (IS_QLA82XX(ha))
		if (IS_P3P_TYPE(ha))
		set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
		break;
		case 6:
		@@ -597,14 +601,23 @@ qla2x00_sysfs_write_reset(struct file filp, struct kobject kobj,
		"Issuing ISP reset.\n");

		scsi_block_requests(vha->host);
		set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
		if (IS_QLA82XX(ha)) {
		ha->flags.isp82xx_no_md_cap = 1;
		qla82xx_idc_lock(ha);
		qla82xx_set_reset_owner(vha);
		qla82xx_idc_unlock(ha);
		}
		} else if (IS_QLA8044(ha)) {
		qla8044_idc_lock(ha);
		idc_control = qla8044_rd_reg(ha,
		QLA8044_IDC_DRV_CTRL);
		qla8044_wr_reg(ha, QLA8044_IDC_DRV_CTRL,
		(idc_control \| GRACEFUL_RESET_BIT1));
		qla82xx_set_reset_owner(vha);
		qla8044_idc_unlock(ha);
		} else {
		set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
		qla2xxx_wake_dpc(vha);
		}
		qla2x00_wait_for_chip_reset(vha);
		scsi_unblock_requests(vha->host);
		break;
		@@ -640,7 +653,7 @@ qla2x00_sysfs_write_reset(struct file filp, struct kobject kobj,
		break;
		}
		case 0x2025e:
		if (!IS_QLA82XX(ha) \|\| vha != base_vha) {
		if (!IS_P3P_TYPE(ha) \|\| vha != base_vha) {
		ql_log(ql_log_info, vha, 0x7071,
		"FCoE ctx reset no supported.\n");
		return -EPERM;
		@@ -1212,7 +1225,7 @@ qla2x00_mpi_version_show(struct device dev, struct device_attribute attr,
		scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
		struct qla_hw_data *ha = vha->hw;

		if (!IS_QLA81XX(ha) && !IS_QLA8031(ha))
		if (!IS_QLA81XX(ha) && !IS_QLA8031(ha) && !IS_QLA8044(ha))
		return snprintf(buf, PAGE_SIZE, "\n");

		return snprintf(buf, PAGE_SIZE, "%d.%02d.%02d (%x)\n",

drivers/scsi/qla2xxx/qla_bsg.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -125,7 +125,7 @@ qla24xx_proc_fcp_prio_cfg_cmd(struct fc_bsg_job *bsg_job)
		uint32_t len;
		uint32_t oper;

		if (!(IS_QLA24XX_TYPE(ha) \|\| IS_QLA25XX(ha) \|\| IS_QLA82XX(ha))) {
		if (!(IS_QLA24XX_TYPE(ha) \|\| IS_QLA25XX(ha) \|\| IS_P3P_TYPE(ha))) {
		ret = -EINVAL;
		goto exit_fcp_prio_cfg;
		}
		@@ -559,7 +559,7 @@ qla81xx_reset_loopback_mode(scsi_qla_host_t vha, uint16_t config,
		uint16_t new_config[4];
		struct qla_hw_data *ha = vha->hw;

		if (!IS_QLA81XX(ha) && !IS_QLA8031(ha))
		if (!IS_QLA81XX(ha) && !IS_QLA8031(ha) && !IS_QLA8044(ha))
		goto done_reset_internal;

		memset(new_config, 0 , sizeof(new_config));
		@@ -629,7 +629,7 @@ qla81xx_set_loopback_mode(scsi_qla_host_t vha, uint16_t config,
		int rval = 0;
		struct qla_hw_data *ha = vha->hw;

		if (!IS_QLA81XX(ha) && !IS_QLA8031(ha))
		if (!IS_QLA81XX(ha) && !IS_QLA8031(ha) && !IS_QLA8044(ha))
		goto done_set_internal;

		if (mode == INTERNAL_LOOPBACK)
		@@ -773,7 +773,7 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)

		if (atomic_read(&vha->loop_state) == LOOP_READY &&
		(ha->current_topology == ISP_CFG_F \|\|
		((IS_QLA81XX(ha) \|\| IS_QLA8031(ha)) &&
		((IS_QLA81XX(ha) \|\| IS_QLA8031(ha) \|\| IS_QLA8044(ha)) &&
		le32_to_cpu((uint32_t )req_data) == ELS_OPCODE_BYTE
		&& req_data_len == MAX_ELS_FRAME_PAYLOAD)) &&
		elreq.options == EXTERNAL_LOOPBACK) {
		@@ -783,7 +783,7 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)
		command_sent = INT_DEF_LB_ECHO_CMD;
		rval = qla2x00_echo_test(vha, &elreq, response);
		} else {
		if (IS_QLA81XX(ha) \|\| IS_QLA8031(ha)) {
		if (IS_QLA81XX(ha) \|\| IS_QLA8031(ha) \|\| IS_QLA8044(ha)) {
		memset(config, 0, sizeof(config));
		memset(new_config, 0, sizeof(new_config));

		@@ -806,7 +806,7 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)
		"elreq.options=%04x\n", elreq.options);

		if (elreq.options == EXTERNAL_LOOPBACK)
		if (IS_QLA8031(ha))
		if (IS_QLA8031(ha) \|\| IS_QLA8044(ha))
		rval = qla81xx_set_loopback_mode(vha,
		config, new_config, elreq.options);
		else

drivers/scsi/qla2xxx/qla_dbg.c

+12 −4

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@
		* ----------------------------------------------------------------------
		* \| Level \| Last Value Used \| Holes \|
		* ----------------------------------------------------------------------
		* \| Module Init and Probe \| 0x014f \| 0x4b,0xba,0xfa \|
		* \| Module Init and Probe \| 0x0151 \| 0x4b,0xba,0xfa \|
		* \| Mailbox commands \| 0x117a \| 0x111a-0x111b \|
		* \| \| \| 0x1155-0x1158 \|
		* \| Device Discovery \| 0x2095 \| 0x2020-0x2022, \|
		@@ -42,7 +42,15 @@
		* \| \| \| 0x800b,0x8039 \|
		* \| AER/EEH \| 0x9011 \| \|
		* \| Virtual Port \| 0xa007 \| \|
		* \| ISP82XX Specific \| 0xb086 \| 0xb002,0xb024 \|
		* \| ISP82XX Specific \| 0xb14c \| 0xb002,0xb024 \|
		* \| \| \| 0xb09e,0xb0ae \|
		* \| \| \| 0xb0e0-0xb0ef \|
		* \| \| \| 0xb085,0xb0dc \|
		* \| \| \| 0xb107,0xb108 \|
		* \| \| \| 0xb111,0xb11e \|
		* \| \| \| 0xb12c,0xb12d \|
		* \| \| \| 0xb13a,0xb142 \|
		* \| \| \| 0xb13c-0xb140 \|
		* \| MultiQ \| 0xc00c \| \|
		* \| Misc \| 0xd010 \| \|
		* \| Target Mode \| 0xe070 \| \|
		@@ -941,7 +949,7 @@ qla24xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
		uint32_t *last_chain = NULL;
		struct scsi_qla_host *base_vha = pci_get_drvdata(ha->pdev);

		if (IS_QLA82XX(ha))
		if (IS_P3P_TYPE(ha))
		return;

		risc_address = ext_mem_cnt = 0;
		@@ -2530,7 +2538,7 @@ ql_dump_regs(uint32_t level, scsi_qla_host_t *vha, int32_t id)
		if (!ql_mask_match(level))
		return;

		if (IS_QLA82XX(ha))
		if (IS_P3P_TYPE(ha))
		mbx_reg = &reg82->mailbox_in[0];
		else if (IS_FWI2_CAPABLE(ha))
		mbx_reg = &reg24->mailbox0;

drivers/scsi/qla2xxx/qla_def.h

+12 −4

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@

		#include "qla_bsg.h"
		#include "qla_nx.h"
		#include "qla_nx2.h"
		#define QLA2XXX_DRIVER_NAME "qla2xxx"
		#define QLA2XXX_APIDEV "ql2xapidev"
		#define QLA2XXX_MANUFACTURER "QLogic Corporation"
		@@ -2935,7 +2936,8 @@ struct qla_hw_data {
		#define DT_ISP2031 BIT_15
		#define DT_ISP8031 BIT_16
		#define DT_ISPFX00 BIT_17
		#define DT_ISP_LAST (DT_ISPFX00 << 1)
		#define DT_ISP8044 BIT_18
		#define DT_ISP_LAST (DT_ISP8044 << 1)

		#define DT_T10_PI BIT_25
		#define DT_IIDMA BIT_26
		@@ -2961,6 +2963,7 @@ struct qla_hw_data {
		#define IS_QLA8001(ha) (DT_MASK(ha) & DT_ISP8001)
		#define IS_QLA81XX(ha) (IS_QLA8001(ha))
		#define IS_QLA82XX(ha) (DT_MASK(ha) & DT_ISP8021)
		#define IS_QLA8044(ha) (DT_MASK(ha) & DT_ISP8044)
		#define IS_QLA2031(ha) (DT_MASK(ha) & DT_ISP2031)
		#define IS_QLA8031(ha) (DT_MASK(ha) & DT_ISP8031)
		#define IS_QLAFX00(ha) (DT_MASK(ha) & DT_ISPFX00)
		@@ -2975,10 +2978,12 @@ struct qla_hw_data {
		#define IS_QLA24XX_TYPE(ha) (IS_QLA24XX(ha) \|\| IS_QLA54XX(ha) \|\| \
		IS_QLA84XX(ha))
		#define IS_CNA_CAPABLE(ha) (IS_QLA81XX(ha) \|\| IS_QLA82XX(ha) \|\| \
		IS_QLA8031(ha))
		IS_QLA8031(ha) \|\| IS_QLA8044(ha))
		#define IS_P3P_TYPE(ha) (IS_QLA82XX(ha) \|\| IS_QLA8044(ha))
		#define IS_QLA2XXX_MIDTYPE(ha) (IS_QLA24XX(ha) \|\| IS_QLA84XX(ha) \|\| \
		IS_QLA25XX(ha) \|\| IS_QLA81XX(ha) \|\| \
		IS_QLA82XX(ha) \|\| IS_QLA83XX(ha))
		IS_QLA82XX(ha) \|\| IS_QLA83XX(ha) \|\| \
		IS_QLA8044(ha))
		#define IS_MSIX_NACK_CAPABLE(ha) (IS_QLA81XX(ha) \|\| IS_QLA83XX(ha))
		#define IS_NOPOLLING_TYPE(ha) ((IS_QLA25XX(ha) \|\| IS_QLA81XX(ha) \|\| \
		IS_QLA83XX(ha)) && (ha)->flags.msix_enabled)
		@@ -3187,10 +3192,12 @@ struct qla_hw_data {
		uint32_t nvram_data_off;

		uint32_t fdt_wrt_disable;
		uint32_t fdt_wrt_enable;
		uint32_t fdt_erase_cmd;
		uint32_t fdt_block_size;
		uint32_t fdt_unprotect_sec_cmd;
		uint32_t fdt_protect_sec_cmd;
		uint32_t fdt_wrt_sts_reg_cmd;

		uint32_t flt_region_flt;
		uint32_t flt_region_fdt;
		@@ -3435,6 +3442,7 @@ typedef struct scsi_qla_host {
		struct bidi_statistics bidi_stats;

		atomic_t vref_count;
		struct qla8044_reset_template reset_tmplt;
		} scsi_qla_host_t;

		#define SET_VP_IDX 1