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

Commit 6246b8a1 authored by Giridhar Malavali's avatar Giridhar Malavali Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Enhancements to support ISP83xx. 



Signed-off-by: default avatarSaurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: default avatarGiridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarHarish Zunjarrao <harish.zunjarrao@qlogic.com>
Signed-off-by: default avatarNigel Kirkland <nigel.kirkland@qlogic.com>
Signed-off-by: default avatarChad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 050c9bb1

drivers/scsi/qla2xxx/qla_attr.c

+14 −9
Original line number Diff line number Diff line
@@ -356,7 +356,8 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj, 
		else if (start == (ha->flt_region_boot * 4) ||

		    start == (ha->flt_region_fw * 4))

			valid = 1;

		else if (IS_QLA25XX(ha) || IS_QLA8XXX_TYPE(ha))

		else if (IS_QLA24XX_TYPE(ha) || IS_QLA25XX(ha)

			|| IS_CNA_CAPABLE(ha) || IS_QLA2031(ha))

			valid = 1;

		if (!valid) {

			ql_log(ql_log_warn, vha, 0x7065,
@@ -898,7 +899,7 @@ qla2x00_alloc_sysfs_attr(scsi_qla_host_t *vha) 
			continue;

		if (iter->is4GBp_only == 2 && !IS_QLA25XX(vha->hw))

			continue;

		if (iter->is4GBp_only == 3 && !(IS_QLA8XXX_TYPE(vha->hw)))

		if (iter->is4GBp_only == 3 && !(IS_CNA_CAPABLE(vha->hw)))

			continue;



		ret = sysfs_create_bin_file(&host->shost_gendev.kobj,
@@ -926,7 +927,7 @@ qla2x00_free_sysfs_attr(scsi_qla_host_t *vha) 
			continue;

		if (iter->is4GBp_only == 2 && !IS_QLA25XX(ha))

			continue;

		if (iter->is4GBp_only == 3 && !!(IS_QLA8XXX_TYPE(vha->hw)))

		if (iter->is4GBp_only == 3 && !(IS_CNA_CAPABLE(vha->hw)))

			continue;



		sysfs_remove_bin_file(&host->shost_gendev.kobj,
@@ -1231,7 +1232,7 @@ 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))

	if (!IS_QLA81XX(ha) && !IS_QLA83XX(ha))

		return snprintf(buf, PAGE_SIZE, "\n");



	return snprintf(buf, PAGE_SIZE, "%d.%02d.%02d (%d)\n",
@@ -1278,7 +1279,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))

	if (!IS_QLA81XX(ha) && !IS_QLA8031(ha))

		return snprintf(buf, PAGE_SIZE, "\n");



	return snprintf(buf, PAGE_SIZE, "%d.%02d.%02d (%x)\n",
@@ -1293,7 +1294,7 @@ qla2x00_phy_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))

	if (!IS_QLA81XX(ha) && !IS_QLA83XX(ha))

		return snprintf(buf, PAGE_SIZE, "\n");



	return snprintf(buf, PAGE_SIZE, "%d.%02d.%02d\n",
@@ -1316,7 +1317,7 @@ qla2x00_vlan_id_show(struct device *dev, struct device_attribute *attr, 
{

	scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));



	if (!IS_QLA8XXX_TYPE(vha->hw))

	if (!IS_CNA_CAPABLE(vha->hw))

		return snprintf(buf, PAGE_SIZE, "\n");



	return snprintf(buf, PAGE_SIZE, "%d\n", vha->fcoe_vlan_id);
@@ -1328,7 +1329,7 @@ qla2x00_vn_port_mac_address_show(struct device *dev, 
{

	scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));



	if (!IS_QLA8XXX_TYPE(vha->hw))

	if (!IS_CNA_CAPABLE(vha->hw))

		return snprintf(buf, PAGE_SIZE, "\n");



	return snprintf(buf, PAGE_SIZE, "%02x:%02x:%02x:%02x:%02x:%02x\n",
@@ -1493,6 +1494,9 @@ qla2x00_get_host_speed(struct Scsi_Host *shost) 
	case PORT_SPEED_10GB:

		speed = FC_PORTSPEED_10GBIT;

		break;

	case PORT_SPEED_16GB:

		speed = FC_PORTSPEED_16GBIT;

		break;

	}

	fc_host_speed(shost) = speed;

}
@@ -1889,6 +1893,7 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable) 
			break;

		}

	}



	if (qos) {

		ret = qla25xx_create_req_que(ha, options, vha->vp_idx, 0, 0,

			qos);
@@ -2086,7 +2091,7 @@ qla2x00_init_host_attr(scsi_qla_host_t *vha) 
	fc_host_max_npiv_vports(vha->host) = ha->max_npiv_vports;

	fc_host_npiv_vports_inuse(vha->host) = ha->cur_vport_count;



	if (IS_QLA8XXX_TYPE(ha))

	if (IS_CNA_CAPABLE(ha))

		speed = FC_PORTSPEED_10GBIT;

	else if (IS_QLA25XX(ha))

		speed = FC_PORTSPEED_8GBIT | FC_PORTSPEED_4GBIT |

drivers/scsi/qla2xxx/qla_bsg.c

+5 −5
Original line number Diff line number Diff line
@@ -540,7 +540,7 @@ qla81xx_set_internal_loopback(scsi_qla_host_t *vha, uint16_t *config, 
	int rval = 0;

	struct qla_hw_data *ha = vha->hw;



	if (!IS_QLA81XX(ha))

	if (!IS_QLA81XX(ha) && !IS_QLA83XX(ha))

		goto done_set_internal;



	new_config[0] = config[0] | (ENABLE_INTERNAL_LOOPBACK << 1);
@@ -582,7 +582,7 @@ qla81xx_reset_internal_loopback(scsi_qla_host_t *vha, uint16_t *config, 
	uint16_t new_config[4];

	struct qla_hw_data *ha = vha->hw;



	if (!IS_QLA81XX(ha))

	if (!IS_QLA81XX(ha) && !IS_QLA83XX(ha))

		goto done_reset_internal;



	memset(new_config, 0 , sizeof(new_config));
@@ -707,7 +707,7 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job) 


	if ((ha->current_topology == ISP_CFG_F ||

	    (atomic_read(&vha->loop_state) == LOOP_DOWN) ||

	    (IS_QLA81XX(ha) &&

	    ((IS_QLA81XX(ha) || IS_QLA83XX(ha)) &&

	    le32_to_cpu(*(uint32_t *)req_data) == ELS_OPCODE_BYTE

	    && req_data_len == MAX_ELS_FRAME_PAYLOAD)) &&

		elreq.options == EXTERNAL_LOOPBACK) {
@@ -717,7 +717,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)) {

		if (IS_QLA81XX(ha) || IS_QLA8031(ha)) {

			memset(config, 0, sizeof(config));

			memset(new_config, 0, sizeof(new_config));

			if (qla81xx_get_port_config(vha, config)) {
@@ -1331,7 +1331,7 @@ qla2x00_optrom_setup(struct fc_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_QLA8XXX_TYPE(ha))

		    IS_CNA_CAPABLE(ha) || IS_QLA2031(ha))

			valid = 1;

		if (!valid) {

			ql_log(ql_log_warn, vha, 0x7058,

drivers/scsi/qla2xxx/qla_dbg.c

+511 −10

File changed.

Preview size limit exceeded, changes collapsed.

drivers/scsi/qla2xxx/qla_dbg.h

+49 −0
Original line number Diff line number Diff line
@@ -165,6 +165,54 @@ struct qla81xx_fw_dump { 
	uint32_t ext_mem[1];

};



struct qla83xx_fw_dump {

	uint32_t host_status;

	uint32_t host_risc_reg[48];

	uint32_t pcie_regs[4];

	uint32_t host_reg[32];

	uint32_t shadow_reg[11];

	uint32_t risc_io_reg;

	uint16_t mailbox_reg[32];

	uint32_t xseq_gp_reg[256];

	uint32_t xseq_0_reg[48];

	uint32_t xseq_1_reg[16];

	uint32_t xseq_2_reg[16];

	uint32_t rseq_gp_reg[256];

	uint32_t rseq_0_reg[32];

	uint32_t rseq_1_reg[16];

	uint32_t rseq_2_reg[16];

	uint32_t rseq_3_reg[16];

	uint32_t aseq_gp_reg[256];

	uint32_t aseq_0_reg[32];

	uint32_t aseq_1_reg[16];

	uint32_t aseq_2_reg[16];

	uint32_t aseq_3_reg[16];

	uint32_t cmd_dma_reg[64];

	uint32_t req0_dma_reg[15];

	uint32_t resp0_dma_reg[15];

	uint32_t req1_dma_reg[15];

	uint32_t xmt0_dma_reg[32];

	uint32_t xmt1_dma_reg[32];

	uint32_t xmt2_dma_reg[32];

	uint32_t xmt3_dma_reg[32];

	uint32_t xmt4_dma_reg[32];

	uint32_t xmt_data_dma_reg[16];

	uint32_t rcvt0_data_dma_reg[32];

	uint32_t rcvt1_data_dma_reg[32];

	uint32_t risc_gp_reg[128];

	uint32_t lmc_reg[128];

	uint32_t fpm_hdw_reg[256];

	uint32_t rq0_array_reg[256];

	uint32_t rq1_array_reg[256];

	uint32_t rp0_array_reg[256];

	uint32_t rp1_array_reg[256];

	uint32_t queue_control_reg[16];

	uint32_t fb_hdw_reg[432];

	uint32_t at0_array_reg[128];

	uint32_t code_ram[0x2400];

	uint32_t ext_mem[1];

};



#define EFT_NUM_BUFFERS		4

#define EFT_BYTES_PER_BUFFER	0x4000

#define EFT_SIZE		((EFT_BYTES_PER_BUFFER) * (EFT_NUM_BUFFERS))
@@ -242,6 +290,7 @@ struct qla2xxx_fw_dump { 
		struct qla24xx_fw_dump isp24;

		struct qla25xx_fw_dump isp25;

		struct qla81xx_fw_dump isp81;

		struct qla83xx_fw_dump isp83;

	} isp;

};

drivers/scsi/qla2xxx/qla_def.h

+27 −10
Original line number Diff line number Diff line
@@ -653,6 +653,7 @@ typedef struct { 
#define MBC_DIAGNOSTIC_LOOP_BACK	0x45	/* Diagnostic loop back. */

#define MBC_ONLINE_SELF_TEST		0x46	/* Online self-test. */

#define MBC_ENHANCED_GET_PORT_DATABASE	0x47	/* Get port database + login */

#define MBC_CONFIGURE_VF		0x4b	/* Configure VFs */

#define MBC_RESET_LINK_STATUS		0x52	/* Reset Link Error Status */

#define MBC_IOCB_COMMAND_A64		0x54	/* Execute IOCB command (64) */

#define MBC_SEND_RNID_ELS		0x57	/* Send RNID ELS request */
@@ -2261,6 +2262,7 @@ struct isp_operations { 
#define QLA_MIDX_DEFAULT	0

#define QLA_MIDX_RSP_Q		1

#define QLA_PCI_MSIX_CONTROL	0xa2

#define QLA_83XX_PCI_MSIX_CONTROL	0x92



struct scsi_qla_host;
@@ -2341,7 +2343,7 @@ struct qla_statistics { 
#define QLA_MQ_SIZE 32

#define QLA_MAX_QUEUES 256

#define ISP_QUE_REG(ha, id) \

	((ha->mqenable) ? \

	((ha->mqenable || IS_QLA83XX(ha)) ? \

	((void *)(ha->mqiobase) +\

	(QLA_QUE_PAGE * id)) :\

	((void *)(ha->iobase)))
@@ -2461,6 +2463,7 @@ struct qla_hw_data { 
#define MIN_IOBASE_LEN          0x100

/* Multi queue data structs */

	device_reg_t __iomem *mqiobase;

	device_reg_t __iomem *msixbase;

	uint16_t        msix_count;

	uint8_t         mqenable;

	struct req_que **req_q_map;
@@ -2494,6 +2497,7 @@ struct qla_hw_data { 
#define PORT_SPEED_2GB  0x01

#define PORT_SPEED_4GB  0x03

#define PORT_SPEED_8GB  0x04

#define PORT_SPEED_16GB 0x05

#define PORT_SPEED_10GB	0x13

	uint16_t	link_data_rate;         /* F/W operating speed */
@@ -2515,6 +2519,8 @@ struct qla_hw_data { 
#define PCI_DEVICE_ID_QLOGIC_ISP2532    0x2532

#define PCI_DEVICE_ID_QLOGIC_ISP8432    0x8432

#define PCI_DEVICE_ID_QLOGIC_ISP8001	0x8001

#define PCI_DEVICE_ID_QLOGIC_ISP8031	0x8031

#define PCI_DEVICE_ID_QLOGIC_ISP2031	0x2031

	uint32_t	device_type;

#define DT_ISP2100                      BIT_0

#define DT_ISP2200                      BIT_1
@@ -2531,7 +2537,9 @@ struct qla_hw_data { 
#define DT_ISP8432                      BIT_12

#define DT_ISP8001			BIT_13

#define DT_ISP8021			BIT_14

#define DT_ISP_LAST			(DT_ISP8021 << 1)

#define DT_ISP2031			BIT_15

#define DT_ISP8031			BIT_16

#define DT_ISP_LAST			(DT_ISP8031 << 1)



#define DT_T10_PI                       BIT_25

#define DT_IIDMA                        BIT_26
@@ -2555,26 +2563,30 @@ struct qla_hw_data { 
#define IS_QLA2532(ha)  (DT_MASK(ha) & DT_ISP2532)

#define IS_QLA8432(ha)  (DT_MASK(ha) & DT_ISP8432)

#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_QLA2031(ha)	(DT_MASK(ha) & DT_ISP2031)

#define IS_QLA8031(ha)	(DT_MASK(ha) & DT_ISP8031)



#define IS_QLA23XX(ha)  (IS_QLA2300(ha) || IS_QLA2312(ha) || IS_QLA2322(ha) || \

			IS_QLA6312(ha) || IS_QLA6322(ha))

#define IS_QLA24XX(ha)  (IS_QLA2422(ha) || IS_QLA2432(ha))

#define IS_QLA54XX(ha)  (IS_QLA5422(ha) || IS_QLA5432(ha))

#define IS_QLA25XX(ha)  (IS_QLA2532(ha))

#define IS_QLA83XX(ha)	(IS_QLA2031(ha) || IS_QLA8031(ha))

#define IS_QLA84XX(ha)  (IS_QLA8432(ha))

#define IS_QLA24XX_TYPE(ha)     (IS_QLA24XX(ha) || IS_QLA54XX(ha) || \

				IS_QLA84XX(ha))

#define IS_QLA81XX(ha)		(IS_QLA8001(ha))

#define IS_QLA8XXX_TYPE(ha)	(IS_QLA81XX(ha) || IS_QLA82XX(ha))

#define IS_CNA_CAPABLE(ha)	(IS_QLA81XX(ha) || IS_QLA82XX(ha) || \

				IS_QLA8031(ha))

#define IS_QLA2XXX_MIDTYPE(ha)	(IS_QLA24XX(ha) || IS_QLA84XX(ha) || \

				IS_QLA25XX(ha) || IS_QLA81XX(ha) || \

				IS_QLA82XX(ha))

#define IS_MSIX_NACK_CAPABLE(ha) (IS_QLA81XX(ha))

#define IS_NOPOLLING_TYPE(ha)	((IS_QLA25XX(ha) || IS_QLA81XX(ha)) && \

				(ha)->flags.msix_enabled)

#define IS_FAC_REQUIRED(ha)	(IS_QLA81XX(ha))

#define IS_NOCACHE_VPD_TYPE(ha)	(IS_QLA81XX(ha))

				IS_QLA82XX(ha) || IS_QLA83XX(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)

#define IS_FAC_REQUIRED(ha)	(IS_QLA81XX(ha) || IS_QLA83XX(ha))

#define IS_NOCACHE_VPD_TYPE(ha)	(IS_QLA81XX(ha) || IS_QLA83XX(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)
@@ -2583,6 +2595,8 @@ struct qla_hw_data { 
#define IS_ZIO_SUPPORTED(ha)    ((ha)->device_type & DT_ZIO_SUPPORTED)

#define IS_OEM_001(ha)          ((ha)->device_type & DT_OEM_001)

#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))



	/* HBA serial number */

	uint8_t		serial0;
@@ -2674,6 +2688,8 @@ struct qla_hw_data { 
	uint16_t	fw_minor_version;

	uint16_t	fw_subminor_version;

	uint16_t	fw_attributes;

	uint16_t	fw_attributes_h;

	uint16_t	fw_attributes_ext[2];

	uint32_t	fw_memory_size;

	uint32_t	fw_transfer_size;

	uint32_t	fw_srisc_address;
@@ -3021,6 +3037,7 @@ typedef struct scsi_qla_host { 
#define OPTROM_SIZE_25XX	0x200000

#define OPTROM_SIZE_81XX	0x400000

#define OPTROM_SIZE_82XX	0x800000

#define OPTROM_SIZE_83XX	0x1000000



#define OPTROM_BURST_SIZE	0x1000

#define OPTROM_BURST_DWORDS	(OPTROM_BURST_SIZE / 4)