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

Commit ecc89f25 authored Mar 12, 2019 by Joe Carnuccio Committed by Martin K. Petersen Mar 19, 2019

scsi: qla2xxx: Add Device ID for ISP28XX



This patch adds PCI device ID ISP28XX for Gen7 support.  Also signature
determination for primary/secondary flash image for ISP27XX/28XX is aded as
part of Gen7 support.

Signed-off-by: Joe Carnuccio <joe.carnuccio@cavium.com>
Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent 24ef8f7e

drivers/scsi/qla2xxx/qla_attr.c

+19 −11

Original line number	Diff line number	Diff line
		@@ -427,7 +427,7 @@ qla2x00_sysfs_write_optrom_ctl(struct file filp, struct kobject kobj,
		valid = 1;
		else if (IS_QLA24XX_TYPE(ha) \|\| IS_QLA25XX(ha)
		\|\| IS_CNA_CAPABLE(ha) \|\| IS_QLA2031(ha)
		\|\| IS_QLA27XX(ha))
		\|\| IS_QLA27XX(ha) \|\| IS_QLA28XX(ha))
		valid = 1;
		if (!valid) {
		ql_log(ql_log_warn, vha, 0x7065,
		@@ -514,7 +514,7 @@ qla2x00_sysfs_read_vpd(struct file filp, struct kobject kobj,
		if (IS_NOCACHE_VPD_TYPE(ha)) {
		faddr = ha->flt_region_vpd << 2;

		if (IS_QLA27XX(ha) &&
		if ((IS_QLA27XX(ha) \|\| IS_QLA28XX(ha)) &&
		qla27xx_find_valid_image(vha) == QLA27XX_SECONDARY_IMAGE)
		faddr = ha->flt_region_vpd_sec << 2;

		@@ -682,7 +682,7 @@ qla2x00_sysfs_write_reset(struct file filp, struct kobject kobj,
		ql_log(ql_log_info, vha, 0x706f,
		"Issuing MPI reset.\n");

		if (IS_QLA83XX(ha) \|\| IS_QLA27XX(ha)) {
		if (IS_QLA83XX(ha) \|\| IS_QLA27XX(ha) \|\| IS_QLA28XX(ha)) {
		uint32_t idc_control;

		qla83xx_idc_lock(vha, 0);
		@@ -991,7 +991,8 @@ qla2x00_free_sysfs_attr(scsi_qla_host_t *vha, bool stop_beacon)
		continue;
		if (iter->is4GBp_only == 3 && !(IS_CNA_CAPABLE(vha->hw)))
		continue;
		if (iter->is4GBp_only == 0x27 && !IS_QLA27XX(vha->hw))
		if (iter->is4GBp_only == 0x27 &&
		(!IS_QLA27XX(vha->hw) \|\| !IS_QLA28XX(ha)))
		continue;

		sysfs_remove_bin_file(&host->shost_gendev.kobj,
		@@ -1336,7 +1337,8 @@ qla2x00_optrom_gold_fw_version_show(struct device *dev,
		scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
		struct qla_hw_data *ha = vha->hw;

		if (!IS_QLA81XX(ha) && !IS_QLA83XX(ha) && !IS_QLA27XX(ha))
		if (!IS_QLA81XX(ha) && !IS_QLA83XX(ha) &&
		!IS_QLA27XX(ha) && !IS_QLA28XX(ha))
		return scnprintf(buf, PAGE_SIZE, "\n");

		return scnprintf(buf, PAGE_SIZE, "%d.%02d.%02d (%d)\n",
		@@ -1383,7 +1385,7 @@ qla2x00_mpi_version_show(struct device dev, struct device_attribute attr,
		struct qla_hw_data *ha = vha->hw;

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

		return scnprintf(buf, PAGE_SIZE, "%d.%02d.%02d (%x)\n",
		@@ -1596,7 +1598,7 @@ qla2x00_pep_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_QLA27XX(ha))
		if (!IS_QLA27XX(ha) && !IS_QLA28XX(ha))
		return scnprintf(buf, PAGE_SIZE, "\n");

		return scnprintf(buf, PAGE_SIZE, "%d.%02d.%02d\n",
		@@ -1610,7 +1612,7 @@ qla2x00_min_link_speed_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_QLA27XX(ha))
		if (!IS_QLA27XX(ha) && !IS_QLA28XX(ha))
		return scnprintf(buf, PAGE_SIZE, "\n");

		return scnprintf(buf, PAGE_SIZE, "%s\n",
		@@ -1628,7 +1630,7 @@ qla2x00_max_speed_sup_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_QLA27XX(ha))
		if (!IS_QLA27XX(ha) && !IS_QLA28XX(ha))
		return scnprintf(buf, PAGE_SIZE, "\n");

		return scnprintf(buf, PAGE_SIZE, "%s\n",
		@@ -1645,7 +1647,7 @@ qla2x00_port_speed_store(struct device dev, struct device_attribute attr,
		int mode = QLA_SET_DATA_RATE_LR;
		struct qla_hw_data *ha = vha->hw;

		if (!IS_QLA27XX(vha->hw)) {
		if (!IS_QLA27XX(ha) && !IS_QLA28XX(ha)) {
		ql_log(ql_log_warn, vha, 0x70d8,
		"Speed setting not supported \n");
		return -EINVAL;
		@@ -2171,7 +2173,7 @@ qla2x00_fw_attr_show(struct device *dev,
		scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
		struct qla_hw_data *ha = vha->hw;

		if (!IS_QLA27XX(ha))
		if (!IS_QLA27XX(ha) && !IS_QLA28XX(ha))
		return scnprintf(buf, PAGE_SIZE, "\n");

		return scnprintf(buf, PAGE_SIZE, "%llx\n",
		@@ -2357,6 +2359,9 @@ qla2x00_get_host_speed(struct Scsi_Host *shost)
		case PORT_SPEED_32GB:
		speed = FC_PORTSPEED_32GBIT;
		break;
		case PORT_SPEED_64GB:
		speed = FC_PORTSPEED_64GBIT;
		break;
		}
		fc_host_speed(shost) = speed;
		}
		@@ -3036,6 +3041,9 @@ qla2x00_init_host_attr(scsi_qla_host_t *vha)
		else if (IS_QLA27XX(ha))
		speed = FC_PORTSPEED_32GBIT \| FC_PORTSPEED_16GBIT \|
		FC_PORTSPEED_8GBIT;
		else if (IS_QLA28XX(ha))
		speed = FC_PORTSPEED_64GBIT \| FC_PORTSPEED_32GBIT \|
		FC_PORTSPEED_16GBIT \| FC_PORTSPEED_8GBIT;
		else
		speed = FC_PORTSPEED_1GBIT;
		fc_host_supported_speeds(vha->host) = speed;

drivers/scsi/qla2xxx/qla_bsg.c

+7 −5

Original line number	Diff line number	Diff line
		@@ -1412,7 +1412,8 @@ qla2x00_optrom_setup(struct bsg_job bsg_job, scsi_qla_host_t vha,
		start == (ha->flt_region_fw * 4))
		valid = 1;
		else if (IS_QLA24XX_TYPE(ha) \|\| IS_QLA25XX(ha) \|\|
		IS_CNA_CAPABLE(ha) \|\| IS_QLA2031(ha) \|\| IS_QLA27XX(ha))
		IS_CNA_CAPABLE(ha) \|\| IS_QLA2031(ha) \|\| IS_QLA27XX(ha) \|\|
		IS_QLA28XX(ha))
		valid = 1;
		if (!valid) {
		ql_log(ql_log_warn, vha, 0x7058,
		@@ -2157,7 +2158,7 @@ qla27xx_get_flash_upd_cap(struct bsg_job *bsg_job)
		struct qla_hw_data *ha = vha->hw;
		struct qla_flash_update_caps cap;

		if (!(IS_QLA27XX(ha)))
		if (!(IS_QLA27XX(ha)) && !IS_QLA28XX(ha))
		return -EPERM;

		memset(&cap, 0, sizeof(cap));
		@@ -2190,7 +2191,7 @@ qla27xx_set_flash_upd_cap(struct bsg_job *bsg_job)
		uint64_t online_fw_attr = 0;
		struct qla_flash_update_caps cap;

		if (!(IS_QLA27XX(ha)))
		if (!IS_QLA27XX(ha) && !IS_QLA28XX(ha))
		return -EPERM;

		memset(&cap, 0, sizeof(cap));
		@@ -2238,7 +2239,7 @@ qla27xx_get_bbcr_data(struct bsg_job *bsg_job)
		uint8_t domain, area, al_pa, state;
		int rval;

		if (!(IS_QLA27XX(ha)))
		if (!IS_QLA27XX(ha) && !IS_QLA28XX(ha))
		return -EPERM;

		memset(&bbcr, 0, sizeof(bbcr));
		@@ -2353,7 +2354,8 @@ qla2x00_do_dport_diagnostics(struct bsg_job *bsg_job)
		int rval;
		struct qla_dport_diag *dd;

		if (!IS_QLA83XX(vha->hw) && !IS_QLA27XX(vha->hw))
		if (!IS_QLA83XX(vha->hw) && !IS_QLA27XX(vha->hw) &&
		!IS_QLA28XX(vha->hw))
		return -EPERM;

		dd = kmalloc(sizeof(*dd), GFP_KERNEL);

drivers/scsi/qla2xxx/qla_dbg.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -176,7 +176,8 @@ qla27xx_dump_mpi_ram(struct qla_hw_data ha, uint32_t addr, uint32_t ram,
		return rval;
		}
		for (j = 0; j < dwords; j++) {
		ram[i + j] = IS_QLA27XX(ha) ?
		ram[i + j] =
		(IS_QLA27XX(ha) \|\| IS_QLA28XX(ha)) ?
		chunk[j] : swab32(chunk[j]);
		}
		}
		@@ -251,7 +252,8 @@ qla24xx_dump_ram(struct qla_hw_data ha, uint32_t addr, uint32_t ram,
		return rval;
		}
		for (j = 0; j < dwords; j++) {
		ram[i + j] = IS_QLA27XX(ha) ?
		ram[i + j] =
		(IS_QLA27XX(ha) \|\| IS_QLA28XX(ha)) ?
		chunk[j] : swab32(chunk[j]);
		}
		}
		@@ -665,7 +667,8 @@ qla25xx_copy_mq(struct qla_hw_data ha, void ptr, uint32_t **last_chain)
		struct qla2xxx_mq_chain *mq = ptr;
		device_reg_t *reg;

		if (!ha->mqenable \|\| IS_QLA83XX(ha) \|\| IS_QLA27XX(ha))
		if (!ha->mqenable \|\| IS_QLA83XX(ha) \|\| IS_QLA27XX(ha) \|\|
		IS_QLA28XX(ha))
		return ptr;

		mq = ptr;

drivers/scsi/qla2xxx/qla_def.h

+44 −18

Original line number	Diff line number	Diff line
		@@ -1203,6 +1203,7 @@ struct mbx_cmd_32 {
		#define QLA27XX_IMG_STATUS_VER_MAJOR 0x01
		#define QLA27XX_IMG_STATUS_VER_MINOR 0x00
		#define QLA27XX_IMG_STATUS_SIGN 0xFACEFADE
		#define QLA28XX_IMG_STATUS_SIGN 0xFACEFADF
		#define QLA27XX_PRIMARY_IMAGE 1
		#define QLA27XX_SECONDARY_IMAGE 2

		@@ -2672,6 +2673,7 @@ struct ct_fdmiv2_hba_attributes {
		#define FDMI_PORT_SPEED_8GB 0x10
		#define FDMI_PORT_SPEED_16GB 0x20
		#define FDMI_PORT_SPEED_32GB 0x40
		#define FDMI_PORT_SPEED_64GB 0x80
		#define FDMI_PORT_SPEED_UNKNOWN 0x8000

		#define FC_CLASS_2 0x04
		@@ -3368,7 +3370,8 @@ struct qla_tc_param {
		#define QLA_MQ_SIZE 32
		#define QLA_MAX_QUEUES 256
		#define ISP_QUE_REG(ha, id) \
		((ha->mqenable \|\| IS_QLA83XX(ha) \|\| IS_QLA27XX(ha)) ? \
		((ha->mqenable \|\| IS_QLA83XX(ha) \|\| \
		IS_QLA27XX(ha) \|\| IS_QLA28XX(ha)) ? \
		((void __iomem )ha->mqiobase + (QLA_QUE_PAGE id)) :\
		((void __iomem *)ha->iobase))
		#define QLA_REQ_QUE_ID(tag) \
		@@ -3703,6 +3706,7 @@ struct qla_hw_data {
		#define PORT_SPEED_8GB 0x04
		#define PORT_SPEED_16GB 0x05
		#define PORT_SPEED_32GB 0x06
		#define PORT_SPEED_64GB 0x07
		#define PORT_SPEED_10GB 0x13
		uint16_t link_data_rate; /* F/W operating speed */
		uint16_t set_data_rate; /* Set by user */
		@@ -3729,6 +3733,11 @@ struct qla_hw_data {
		#define PCI_DEVICE_ID_QLOGIC_ISP2071 0x2071
		#define PCI_DEVICE_ID_QLOGIC_ISP2271 0x2271
		#define PCI_DEVICE_ID_QLOGIC_ISP2261 0x2261
		#define PCI_DEVICE_ID_QLOGIC_ISP2061 0x2061
		#define PCI_DEVICE_ID_QLOGIC_ISP2081 0x2081
		#define PCI_DEVICE_ID_QLOGIC_ISP2089 0x2089
		#define PCI_DEVICE_ID_QLOGIC_ISP2281 0x2281
		#define PCI_DEVICE_ID_QLOGIC_ISP2289 0x2289

		uint32_t isp_type;
		#define DT_ISP2100 BIT_0
		@@ -3753,7 +3762,12 @@ struct qla_hw_data {
		#define DT_ISP2071 BIT_19
		#define DT_ISP2271 BIT_20
		#define DT_ISP2261 BIT_21
		#define DT_ISP_LAST (DT_ISP2261 << 1)
		#define DT_ISP2061 BIT_22
		#define DT_ISP2081 BIT_23
		#define DT_ISP2089 BIT_24
		#define DT_ISP2281 BIT_25
		#define DT_ISP2289 BIT_26
		#define DT_ISP_LAST (DT_ISP2289 << 1)

		uint32_t device_type;
		#define DT_T10_PI BIT_25
		@@ -3788,6 +3802,8 @@ struct qla_hw_data {
		#define IS_QLA2071(ha) (DT_MASK(ha) & DT_ISP2071)
		#define IS_QLA2271(ha) (DT_MASK(ha) & DT_ISP2271)
		#define IS_QLA2261(ha) (DT_MASK(ha) & DT_ISP2261)
		#define IS_QLA2081(ha) (DT_MASK(ha) & DT_ISP2081)
		#define IS_QLA2281(ha) (DT_MASK(ha) & DT_ISP2281)

		#define IS_QLA23XX(ha) (IS_QLA2300(ha) \|\| IS_QLA2312(ha) \|\| IS_QLA2322(ha) \|\| \
		IS_QLA6312(ha) \|\| IS_QLA6322(ha))
		@@ -3797,6 +3813,7 @@ struct qla_hw_data {
		#define IS_QLA83XX(ha) (IS_QLA2031(ha) \|\| IS_QLA8031(ha))
		#define IS_QLA84XX(ha) (IS_QLA8432(ha))
		#define IS_QLA27XX(ha) (IS_QLA2071(ha) \|\| IS_QLA2271(ha) \|\| IS_QLA2261(ha))
		#define IS_QLA28XX(ha) (IS_QLA2081(ha) \|\| IS_QLA2281(ha))
		#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) \|\| \
		@@ -3805,14 +3822,15 @@ struct qla_hw_data {
		#define IS_QLA2XXX_MIDTYPE(ha) (IS_QLA24XX(ha) \|\| IS_QLA84XX(ha) \|\| \
		IS_QLA25XX(ha) \|\| IS_QLA81XX(ha) \|\| \
		IS_QLA82XX(ha) \|\| IS_QLA83XX(ha) \|\| \
		IS_QLA8044(ha) \|\| IS_QLA27XX(ha))
		IS_QLA8044(ha) \|\| IS_QLA27XX(ha) \|\| \
		IS_QLA28XX(ha))
		#define IS_MSIX_NACK_CAPABLE(ha) (IS_QLA81XX(ha) \|\| IS_QLA83XX(ha) \|\| \
		IS_QLA27XX(ha))
		IS_QLA27XX(ha) \|\| IS_QLA28XX(ha))
		#define IS_NOPOLLING_TYPE(ha) (IS_QLA81XX(ha) && (ha)->flags.msix_enabled)
		#define IS_FAC_REQUIRED(ha) (IS_QLA81XX(ha) \|\| IS_QLA83XX(ha) \|\| \
		IS_QLA27XX(ha))
		IS_QLA27XX(ha) \|\| IS_QLA28XX(ha))
		#define IS_NOCACHE_VPD_TYPE(ha) (IS_QLA81XX(ha) \|\| IS_QLA83XX(ha) \|\| \
		IS_QLA27XX(ha))
		IS_QLA27XX(ha) \|\| IS_QLA28XX(ha))
		#define IS_ALOGIO_CAPABLE(ha) (IS_QLA23XX(ha) \|\| IS_FWI2_CAPABLE(ha))

		#define IS_T10_PI_CAPABLE(ha) ((ha)->device_type & DT_T10_PI)
		@@ -3823,28 +3841,34 @@ struct qla_hw_data {
		#define HAS_EXTENDED_IDS(ha) ((ha)->device_type & DT_EXTENDED_IDS)
		#define IS_CT6_SUPPORTED(ha) ((ha)->device_type & DT_CT6_SUPPORTED)
		#define IS_MQUE_CAPABLE(ha) ((ha)->mqenable \|\| IS_QLA83XX(ha) \|\| \
		IS_QLA27XX(ha))
		#define IS_BIDI_CAPABLE(ha) ((IS_QLA25XX(ha) \|\| IS_QLA2031(ha)))
		IS_QLA27XX(ha) \|\| IS_QLA28XX(ha))
		#define IS_BIDI_CAPABLE(ha) \
		(IS_QLA25XX(ha) \|\| IS_QLA2031(ha) \|\| IS_QLA27XX(ha) \|\| IS_QLA28XX(ha))
		/* Bit 21 of fw_attributes decides the MCTP capabilities */
		#define IS_MCTP_CAPABLE(ha) (IS_QLA2031(ha) && \
		((ha)->fw_attributes_ext[0] & BIT_0))
		#define IS_PI_UNINIT_CAPABLE(ha) (IS_QLA83XX(ha) \|\| IS_QLA27XX(ha))
		#define IS_PI_IPGUARD_CAPABLE(ha) (IS_QLA83XX(ha) \|\| IS_QLA27XX(ha))
		#define IS_PI_DIFB_DIX0_CAPABLE(ha) (0)
		#define IS_PI_SPLIT_DET_CAPABLE_HBA(ha) (IS_QLA83XX(ha) \|\| IS_QLA27XX(ha))
		#define IS_PI_SPLIT_DET_CAPABLE_HBA(ha) (IS_QLA83XX(ha) \|\| IS_QLA27XX(ha) \|\| \
		IS_QLA28XX(ha))
		#define IS_PI_SPLIT_DET_CAPABLE(ha) (IS_PI_SPLIT_DET_CAPABLE_HBA(ha) && \
		(((ha)->fw_attributes_h << 16 \| (ha)->fw_attributes) & BIT_22))
		#define IS_ATIO_MSIX_CAPABLE(ha) (IS_QLA83XX(ha) \|\| IS_QLA27XX(ha))
		#define IS_ATIO_MSIX_CAPABLE(ha) (IS_QLA83XX(ha) \|\| IS_QLA27XX(ha) \|\| \
		IS_QLA28XX(ha))
		#define IS_TGT_MODE_CAPABLE(ha) (ha->tgt.atio_q_length)
		#define IS_SHADOW_REG_CAPABLE(ha) (IS_QLA27XX(ha))
		#define IS_DPORT_CAPABLE(ha) (IS_QLA83XX(ha) \|\| IS_QLA27XX(ha))
		#define IS_FAWWN_CAPABLE(ha) (IS_QLA83XX(ha) \|\| IS_QLA27XX(ha))
		#define IS_SHADOW_REG_CAPABLE(ha) (IS_QLA27XX(ha) \|\| IS_QLA28XX(ha))
		#define IS_DPORT_CAPABLE(ha) (IS_QLA83XX(ha) \|\| IS_QLA27XX(ha) \|\| \
		IS_QLA28XX(ha))
		#define IS_FAWWN_CAPABLE(ha) (IS_QLA83XX(ha) \|\| IS_QLA27XX(ha) \|\| \
		IS_QLA28XX(ha))
		#define IS_EXCHG_OFFLD_CAPABLE(ha) \
		(IS_QLA81XX(ha) \|\| IS_QLA83XX(ha) \|\| IS_QLA27XX(ha))
		(IS_QLA81XX(ha) \|\| IS_QLA83XX(ha) \|\| IS_QLA27XX(ha) \|\| IS_QLA28XX(ha))
		#define IS_EXLOGIN_OFFLD_CAPABLE(ha) \
		(IS_QLA25XX(ha) \|\| IS_QLA81XX(ha) \|\| IS_QLA83XX(ha) \|\| IS_QLA27XX(ha))
		(IS_QLA25XX(ha) \|\| IS_QLA81XX(ha) \|\| IS_QLA83XX(ha) \|\| \
		IS_QLA27XX(ha) \|\| IS_QLA28XX(ha))
		#define USE_ASYNC_SCAN(ha) (IS_QLA25XX(ha) \|\| IS_QLA81XX(ha) \|\|\
		IS_QLA83XX(ha) \|\| IS_QLA27XX(ha))
		IS_QLA83XX(ha) \|\| IS_QLA27XX(ha) \|\| IS_QLA28XX(ha))

		/* HBA serial number */
		uint8_t serial0;
		@@ -4595,6 +4619,7 @@ struct qla2_sgx {
		#define OPTROM_SIZE_81XX 0x400000
		#define OPTROM_SIZE_82XX 0x800000
		#define OPTROM_SIZE_83XX 0x1000000
		#define OPTROM_SIZE_28XX 0x2000000

		#define OPTROM_BURST_SIZE 0x1000
		#define OPTROM_BURST_DWORDS (OPTROM_BURST_SIZE / 4)
		@@ -4691,10 +4716,11 @@ struct sff_8247_a0 {
		#define AUTO_DETECT_SFP_SUPPORT(_vha)\
		(ql2xautodetectsfp && !_vha->vp_idx && \
		(IS_QLA25XX(_vha->hw) \|\| IS_QLA81XX(_vha->hw) \|\|\
		IS_QLA83XX(_vha->hw) \|\| IS_QLA27XX(_vha->hw)))
		IS_QLA83XX(_vha->hw) \|\| IS_QLA27XX(_vha->hw) \|\| \
		IS_QLA28XX(_vha->hw)))

		#define USER_CTRL_IRQ(_ha) (ql2xuctrlirq && QLA_TGT_MODE_ENABLED() && \
		(IS_QLA27XX(_ha) \|\| IS_QLA83XX(_ha)))
		(IS_QLA27XX(_ha) \|\| IS_QLA28XX(_ha) \|\| IS_QLA83XX(_ha)))

		#define SAVE_TOPO(_ha) { \
		if (_ha->current_topology) \

drivers/scsi/qla2xxx/qla_dfs.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -386,7 +386,7 @@ qla_dfs_naqp_write(struct file file, const char __user buffer,
		int rc = 0;
		unsigned long num_act_qp;

		if (!(IS_QLA27XX(ha) \|\| IS_QLA83XX(ha))) {
		if (!(IS_QLA27XX(ha) \|\| IS_QLA83XX(ha) \|\| IS_QLA28XX(ha))) {
		pr_err("host%ld: this adapter does not support Multi Q.",
		vha->host_no);
		return -EINVAL;
		@@ -438,7 +438,7 @@ qla2x00_dfs_setup(scsi_qla_host_t *vha)
		struct qla_hw_data *ha = vha->hw;

		if (!IS_QLA25XX(ha) && !IS_QLA81XX(ha) && !IS_QLA83XX(ha) &&
		!IS_QLA27XX(ha))
		!IS_QLA27XX(ha) && !IS_QLA28XX(ha))
		goto out;
		if (!ha->fce)
		goto out;
		@@ -474,7 +474,7 @@ qla2x00_dfs_setup(scsi_qla_host_t *vha)
		ha->tgt.dfs_tgt_sess = debugfs_create_file("tgt_sess",
		S_IRUSR, ha->dfs_dir, vha, &dfs_tgt_sess_ops);

		if (IS_QLA27XX(ha) \|\| IS_QLA83XX(ha))
		if (IS_QLA27XX(ha) \|\| IS_QLA83XX(ha) \|\| IS_QLA28XX(ha))
		ha->tgt.dfs_naqp = debugfs_create_file("naqp",
		0400, ha->dfs_dir, vha, &dfs_naqp_ops);
		out: