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

Commit ad950360 authored by Bart Van Assche's avatar Bart Van Assche Committed by James Bottomley
Browse files

qla2xxx: Remove __constant_ prefix 



Whether htonl() or __constant_htonl() is used, if the argument
is a constant the conversion happens at compile time. Hence leave
out the __constant_ prefix for this and other endianness
conversion functions. This improves source code readability.

[jejb: checkpatch fixes]
Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Acked-by: default avatarHimanshu Madhani <himanshu.madhani@qlogic.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Odin.com>
parent df3f4cd0

drivers/scsi/qla2xxx/qla_dbg.c

+18 −18
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ qla25xx_copy_fce(struct qla_hw_data *ha, void *ptr, uint32_t **last_chain) 
		return ptr;



	*last_chain = &fcec->type;

	fcec->type = __constant_htonl(DUMP_CHAIN_FCE);

	fcec->type = htonl(DUMP_CHAIN_FCE);

	fcec->chain_size = htonl(sizeof(struct qla2xxx_fce_chain) +

	    fce_calc_size(ha->fce_bufs));

	fcec->size = htonl(fce_calc_size(ha->fce_bufs));
@@ -527,7 +527,7 @@ qla2xxx_copy_atioqueues(struct qla_hw_data *ha, void *ptr, 
		/* aqp = ha->atio_q_map[que]; */

		q = ptr;

		*last_chain = &q->type;

		q->type = __constant_htonl(DUMP_CHAIN_QUEUE);

		q->type = htonl(DUMP_CHAIN_QUEUE);

		q->chain_size = htonl(

		    sizeof(struct qla2xxx_mqueue_chain) +

		    sizeof(struct qla2xxx_mqueue_header) +
@@ -536,7 +536,7 @@ qla2xxx_copy_atioqueues(struct qla_hw_data *ha, void *ptr, 


		/* Add header. */

		qh = ptr;

		qh->queue = __constant_htonl(TYPE_ATIO_QUEUE);

		qh->queue = htonl(TYPE_ATIO_QUEUE);

		qh->number = htonl(que);

		qh->size = htonl(aqp->length * sizeof(request_t));

		ptr += sizeof(struct qla2xxx_mqueue_header);
@@ -571,7 +571,7 @@ qla25xx_copy_mqueues(struct qla_hw_data *ha, void *ptr, uint32_t **last_chain) 
		/* Add chain. */

		q = ptr;

		*last_chain = &q->type;

		q->type = __constant_htonl(DUMP_CHAIN_QUEUE);

		q->type = htonl(DUMP_CHAIN_QUEUE);

		q->chain_size = htonl(

		    sizeof(struct qla2xxx_mqueue_chain) +

		    sizeof(struct qla2xxx_mqueue_header) +
@@ -580,7 +580,7 @@ qla25xx_copy_mqueues(struct qla_hw_data *ha, void *ptr, uint32_t **last_chain) 


		/* Add header. */

		qh = ptr;

		qh->queue = __constant_htonl(TYPE_REQUEST_QUEUE);

		qh->queue = htonl(TYPE_REQUEST_QUEUE);

		qh->number = htonl(que);

		qh->size = htonl(req->length * sizeof(request_t));

		ptr += sizeof(struct qla2xxx_mqueue_header);
@@ -599,7 +599,7 @@ qla25xx_copy_mqueues(struct qla_hw_data *ha, void *ptr, uint32_t **last_chain) 
		/* Add chain. */

		q = ptr;

		*last_chain = &q->type;

		q->type = __constant_htonl(DUMP_CHAIN_QUEUE);

		q->type = htonl(DUMP_CHAIN_QUEUE);

		q->chain_size = htonl(

		    sizeof(struct qla2xxx_mqueue_chain) +

		    sizeof(struct qla2xxx_mqueue_header) +
@@ -608,7 +608,7 @@ qla25xx_copy_mqueues(struct qla_hw_data *ha, void *ptr, uint32_t **last_chain) 


		/* Add header. */

		qh = ptr;

		qh->queue = __constant_htonl(TYPE_RESPONSE_QUEUE);

		qh->queue = htonl(TYPE_RESPONSE_QUEUE);

		qh->number = htonl(que);

		qh->size = htonl(rsp->length * sizeof(response_t));

		ptr += sizeof(struct qla2xxx_mqueue_header);
@@ -634,8 +634,8 @@ qla25xx_copy_mq(struct qla_hw_data *ha, void *ptr, uint32_t **last_chain) 


	mq = ptr;

	*last_chain = &mq->type;

	mq->type = __constant_htonl(DUMP_CHAIN_MQ);

	mq->chain_size = __constant_htonl(sizeof(struct qla2xxx_mq_chain));

	mq->type = htonl(DUMP_CHAIN_MQ);

	mq->chain_size = htonl(sizeof(struct qla2xxx_mq_chain));



	que_cnt = ha->max_req_queues > ha->max_rsp_queues ?

		ha->max_req_queues : ha->max_rsp_queues;
@@ -1271,8 +1271,8 @@ qla24xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked) 
	nxt_chain = (void *)ha->fw_dump + ha->chain_offset;

	nxt_chain = qla2xxx_copy_atioqueues(ha, nxt_chain, &last_chain);

	if (last_chain) {

		ha->fw_dump->version |= __constant_htonl(DUMP_CHAIN_VARIANT);

		*last_chain |= __constant_htonl(DUMP_CHAIN_LAST);

		ha->fw_dump->version |= htonl(DUMP_CHAIN_VARIANT);

		*last_chain |= htonl(DUMP_CHAIN_LAST);

	}



	/* Adjust valid length. */
@@ -1323,7 +1323,7 @@ qla25xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked) 
	}

	fw = &ha->fw_dump->isp.isp25;

	qla2xxx_prep_dump(ha, ha->fw_dump);

	ha->fw_dump->version = __constant_htonl(2);

	ha->fw_dump->version = htonl(2);



	fw->host_status = htonl(RD_REG_DWORD(&reg->host_status));
@@ -1587,8 +1587,8 @@ qla25xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked) 
	nxt_chain = qla25xx_copy_mqueues(ha, nxt_chain, &last_chain);

	nxt_chain = qla2xxx_copy_atioqueues(ha, nxt_chain, &last_chain);

	if (last_chain) {

		ha->fw_dump->version |= __constant_htonl(DUMP_CHAIN_VARIANT);

		*last_chain |= __constant_htonl(DUMP_CHAIN_LAST);

		ha->fw_dump->version |= htonl(DUMP_CHAIN_VARIANT);

		*last_chain |= htonl(DUMP_CHAIN_LAST);

	}



	/* Adjust valid length. */
@@ -1905,8 +1905,8 @@ qla81xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked) 
	nxt_chain = qla25xx_copy_mqueues(ha, nxt_chain, &last_chain);

	nxt_chain = qla2xxx_copy_atioqueues(ha, nxt_chain, &last_chain);

	if (last_chain) {

		ha->fw_dump->version |= __constant_htonl(DUMP_CHAIN_VARIANT);

		*last_chain |= __constant_htonl(DUMP_CHAIN_LAST);

		ha->fw_dump->version |= htonl(DUMP_CHAIN_VARIANT);

		*last_chain |= htonl(DUMP_CHAIN_LAST);

	}



	/* Adjust valid length. */
@@ -2408,8 +2408,8 @@ qla83xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked) 
	nxt_chain = qla25xx_copy_mqueues(ha, nxt_chain, &last_chain);

	nxt_chain = qla2xxx_copy_atioqueues(ha, nxt_chain, &last_chain);

	if (last_chain) {

		ha->fw_dump->version |= __constant_htonl(DUMP_CHAIN_VARIANT);

		*last_chain |= __constant_htonl(DUMP_CHAIN_LAST);

		ha->fw_dump->version |= htonl(DUMP_CHAIN_VARIANT);

		*last_chain |= htonl(DUMP_CHAIN_LAST);

	}



	/* Adjust valid length. */

drivers/scsi/qla2xxx/qla_gs.c

+26 −26
Original line number Diff line number Diff line
@@ -35,10 +35,10 @@ qla2x00_prep_ms_iocb(scsi_qla_host_t *vha, uint32_t req_size, uint32_t rsp_size) 
	ms_pkt->entry_type = MS_IOCB_TYPE;

	ms_pkt->entry_count = 1;

	SET_TARGET_ID(ha, ms_pkt->loop_id, SIMPLE_NAME_SERVER);

	ms_pkt->control_flags = __constant_cpu_to_le16(CF_READ | CF_HEAD_TAG);

	ms_pkt->control_flags = cpu_to_le16(CF_READ | CF_HEAD_TAG);

	ms_pkt->timeout = cpu_to_le16(ha->r_a_tov / 10 * 2);

	ms_pkt->cmd_dsd_count = __constant_cpu_to_le16(1);

	ms_pkt->total_dsd_count = __constant_cpu_to_le16(2);

	ms_pkt->cmd_dsd_count = cpu_to_le16(1);

	ms_pkt->total_dsd_count = cpu_to_le16(2);

	ms_pkt->rsp_bytecount = cpu_to_le32(rsp_size);

	ms_pkt->req_bytecount = cpu_to_le32(req_size);
@@ -74,10 +74,10 @@ qla24xx_prep_ms_iocb(scsi_qla_host_t *vha, uint32_t req_size, uint32_t rsp_size) 


	ct_pkt->entry_type = CT_IOCB_TYPE;

	ct_pkt->entry_count = 1;

	ct_pkt->nport_handle = __constant_cpu_to_le16(NPH_SNS);

	ct_pkt->nport_handle = cpu_to_le16(NPH_SNS);

	ct_pkt->timeout = cpu_to_le16(ha->r_a_tov / 10 * 2);

	ct_pkt->cmd_dsd_count = __constant_cpu_to_le16(1);

	ct_pkt->rsp_dsd_count = __constant_cpu_to_le16(1);

	ct_pkt->cmd_dsd_count = cpu_to_le16(1);

	ct_pkt->rsp_dsd_count = cpu_to_le16(1);

	ct_pkt->rsp_byte_count = cpu_to_le32(rsp_size);

	ct_pkt->cmd_byte_count = cpu_to_le32(req_size);
@@ -142,7 +142,7 @@ qla2x00_chk_ms_status(scsi_qla_host_t *vha, ms_iocb_entry_t *ms_pkt, 
		case CS_DATA_UNDERRUN:

		case CS_DATA_OVERRUN:		/* Overrun? */

			if (ct_rsp->header.response !=

			    __constant_cpu_to_be16(CT_ACCEPT_RESPONSE)) {

			    cpu_to_be16(CT_ACCEPT_RESPONSE)) {

				ql_dbg(ql_dbg_disc + ql_dbg_buffer, vha, 0x2077,

				    "%s failed rejected request on port_id: %02x%02x%02x Compeltion status 0x%x, response 0x%x\n",

				    routine, vha->d_id.b.domain,
@@ -1153,10 +1153,10 @@ qla2x00_prep_ms_fdmi_iocb(scsi_qla_host_t *vha, uint32_t req_size, 
	ms_pkt->entry_type = MS_IOCB_TYPE;

	ms_pkt->entry_count = 1;

	SET_TARGET_ID(ha, ms_pkt->loop_id, vha->mgmt_svr_loop_id);

	ms_pkt->control_flags = __constant_cpu_to_le16(CF_READ | CF_HEAD_TAG);

	ms_pkt->control_flags = cpu_to_le16(CF_READ | CF_HEAD_TAG);

	ms_pkt->timeout = cpu_to_le16(ha->r_a_tov / 10 * 2);

	ms_pkt->cmd_dsd_count = __constant_cpu_to_le16(1);

	ms_pkt->total_dsd_count = __constant_cpu_to_le16(2);

	ms_pkt->cmd_dsd_count = cpu_to_le16(1);

	ms_pkt->total_dsd_count = cpu_to_le16(2);

	ms_pkt->rsp_bytecount = cpu_to_le32(rsp_size);

	ms_pkt->req_bytecount = cpu_to_le32(req_size);
@@ -1193,8 +1193,8 @@ qla24xx_prep_ms_fdmi_iocb(scsi_qla_host_t *vha, uint32_t req_size, 
	ct_pkt->entry_count = 1;

	ct_pkt->nport_handle = cpu_to_le16(vha->mgmt_svr_loop_id);

	ct_pkt->timeout = cpu_to_le16(ha->r_a_tov / 10 * 2);

	ct_pkt->cmd_dsd_count = __constant_cpu_to_le16(1);

	ct_pkt->rsp_dsd_count = __constant_cpu_to_le16(1);

	ct_pkt->cmd_dsd_count = cpu_to_le16(1);

	ct_pkt->rsp_dsd_count = cpu_to_le16(1);

	ct_pkt->rsp_byte_count = cpu_to_le32(rsp_size);

	ct_pkt->cmd_byte_count = cpu_to_le32(req_size);
@@ -1281,19 +1281,19 @@ qla2x00_fdmi_rhba(scsi_qla_host_t *vha) 


	/* Prepare FDMI command arguments -- attribute block, attributes. */

	memcpy(ct_req->req.rhba.hba_identifier, vha->port_name, WWN_SIZE);

	ct_req->req.rhba.entry_count = __constant_cpu_to_be32(1);

	ct_req->req.rhba.entry_count = cpu_to_be32(1);

	memcpy(ct_req->req.rhba.port_name, vha->port_name, WWN_SIZE);

	size = 2 * WWN_SIZE + 4 + 4;



	/* Attributes */

	ct_req->req.rhba.attrs.count =

	    __constant_cpu_to_be32(FDMI_HBA_ATTR_COUNT);

	    cpu_to_be32(FDMI_HBA_ATTR_COUNT);

	entries = ct_req->req.rhba.hba_identifier;



	/* Nodename. */

	eiter = entries + size;

	eiter->type = __constant_cpu_to_be16(FDMI_HBA_NODE_NAME);

	eiter->len = __constant_cpu_to_be16(4 + WWN_SIZE);

	eiter->type = cpu_to_be16(FDMI_HBA_NODE_NAME);

	eiter->len = cpu_to_be16(4 + WWN_SIZE);

	memcpy(eiter->a.node_name, vha->node_name, WWN_SIZE);

	size += 4 + WWN_SIZE;
@@ -1302,7 +1302,7 @@ qla2x00_fdmi_rhba(scsi_qla_host_t *vha) 


	/* Manufacturer. */

	eiter = entries + size;

	eiter->type = __constant_cpu_to_be16(FDMI_HBA_MANUFACTURER);

	eiter->type = cpu_to_be16(FDMI_HBA_MANUFACTURER);

	alen = strlen(QLA2XXX_MANUFACTURER);

	snprintf(eiter->a.manufacturer, sizeof(eiter->a.manufacturer),

	    "%s", "QLogic Corporation");
@@ -1315,7 +1315,7 @@ qla2x00_fdmi_rhba(scsi_qla_host_t *vha) 


	/* Serial number. */

	eiter = entries + size;

	eiter->type = __constant_cpu_to_be16(FDMI_HBA_SERIAL_NUMBER);

	eiter->type = cpu_to_be16(FDMI_HBA_SERIAL_NUMBER);

	if (IS_FWI2_CAPABLE(ha))

		qla2xxx_get_vpd_field(vha, "SN", eiter->a.serial_num,

		    sizeof(eiter->a.serial_num));
@@ -1335,7 +1335,7 @@ qla2x00_fdmi_rhba(scsi_qla_host_t *vha) 


	/* Model name. */

	eiter = entries + size;

	eiter->type = __constant_cpu_to_be16(FDMI_HBA_MODEL);

	eiter->type = cpu_to_be16(FDMI_HBA_MODEL);

	snprintf(eiter->a.model, sizeof(eiter->a.model),

	    "%s", ha->model_number);

	alen = strlen(eiter->a.model);
@@ -1348,7 +1348,7 @@ qla2x00_fdmi_rhba(scsi_qla_host_t *vha) 


	/* Model description. */

	eiter = entries + size;

	eiter->type = __constant_cpu_to_be16(FDMI_HBA_MODEL_DESCRIPTION);

	eiter->type = cpu_to_be16(FDMI_HBA_MODEL_DESCRIPTION);

	snprintf(eiter->a.model_desc, sizeof(eiter->a.model_desc),

	    "%s", ha->model_desc);

	alen = strlen(eiter->a.model_desc);
@@ -1361,7 +1361,7 @@ qla2x00_fdmi_rhba(scsi_qla_host_t *vha) 


	/* Hardware version. */

	eiter = entries + size;

	eiter->type = __constant_cpu_to_be16(FDMI_HBA_HARDWARE_VERSION);

	eiter->type = cpu_to_be16(FDMI_HBA_HARDWARE_VERSION);

	if (!IS_FWI2_CAPABLE(ha)) {

		snprintf(eiter->a.hw_version, sizeof(eiter->a.hw_version),

		    "HW:%s", ha->adapter_id);
@@ -1385,7 +1385,7 @@ qla2x00_fdmi_rhba(scsi_qla_host_t *vha) 


	/* Driver version. */

	eiter = entries + size;

	eiter->type = __constant_cpu_to_be16(FDMI_HBA_DRIVER_VERSION);

	eiter->type = cpu_to_be16(FDMI_HBA_DRIVER_VERSION);

	snprintf(eiter->a.driver_version, sizeof(eiter->a.driver_version),

	    "%s", qla2x00_version_str);

	alen = strlen(eiter->a.driver_version);
@@ -1398,7 +1398,7 @@ qla2x00_fdmi_rhba(scsi_qla_host_t *vha) 


	/* Option ROM version. */

	eiter = entries + size;

	eiter->type = __constant_cpu_to_be16(FDMI_HBA_OPTION_ROM_VERSION);

	eiter->type = cpu_to_be16(FDMI_HBA_OPTION_ROM_VERSION);

	snprintf(eiter->a.orom_version, sizeof(eiter->a.orom_version),

	    "%d.%02d", ha->bios_revision[1], ha->bios_revision[0]);

	alen = strlen(eiter->a.orom_version);
@@ -1411,7 +1411,7 @@ qla2x00_fdmi_rhba(scsi_qla_host_t *vha) 


	/* Firmware version */

	eiter = entries + size;

	eiter->type = __constant_cpu_to_be16(FDMI_HBA_FIRMWARE_VERSION);

	eiter->type = cpu_to_be16(FDMI_HBA_FIRMWARE_VERSION);

	ha->isp_ops->fw_version_str(vha, eiter->a.fw_version,

	    sizeof(eiter->a.fw_version));

	alen = strlen(eiter->a.fw_version);
@@ -2484,8 +2484,8 @@ qla24xx_prep_ms_fm_iocb(scsi_qla_host_t *vha, uint32_t req_size, 
	ct_pkt->entry_count = 1;

	ct_pkt->nport_handle = cpu_to_le16(vha->mgmt_svr_loop_id);

	ct_pkt->timeout = cpu_to_le16(ha->r_a_tov / 10 * 2);

	ct_pkt->cmd_dsd_count = __constant_cpu_to_le16(1);

	ct_pkt->rsp_dsd_count = __constant_cpu_to_le16(1);

	ct_pkt->cmd_dsd_count = cpu_to_le16(1);

	ct_pkt->rsp_dsd_count = cpu_to_le16(1);

	ct_pkt->rsp_byte_count = cpu_to_le32(rsp_size);

	ct_pkt->cmd_byte_count = cpu_to_le32(req_size);

drivers/scsi/qla2xxx/qla_init.c

+69 −74
Original line number Diff line number Diff line
@@ -1685,7 +1685,7 @@ qla2x00_alloc_fw_dump(scsi_qla_host_t *vha) 
	ha->fw_dump->signature[1] = 'L';

	ha->fw_dump->signature[2] = 'G';

	ha->fw_dump->signature[3] = 'C';

	ha->fw_dump->version = __constant_htonl(1);

	ha->fw_dump->version = htonl(1);



	ha->fw_dump->fixed_size = htonl(fixed_size);

	ha->fw_dump->mem_size = htonl(mem_size);
@@ -2065,8 +2065,8 @@ qla2x00_config_rings(struct scsi_qla_host *vha) 
	struct rsp_que *rsp = ha->rsp_q_map[0];



	/* Setup ring parameters in initialization control block. */

	ha->init_cb->request_q_outpointer = __constant_cpu_to_le16(0);

	ha->init_cb->response_q_inpointer = __constant_cpu_to_le16(0);

	ha->init_cb->request_q_outpointer = cpu_to_le16(0);

	ha->init_cb->response_q_inpointer = cpu_to_le16(0);

	ha->init_cb->request_q_length = cpu_to_le16(req->length);

	ha->init_cb->response_q_length = cpu_to_le16(rsp->length);

	ha->init_cb->request_q_address[0] = cpu_to_le32(LSD(req->dma));
@@ -2095,8 +2095,8 @@ qla24xx_config_rings(struct scsi_qla_host *vha) 


	/* Setup ring parameters in initialization control block. */

	icb = (struct init_cb_24xx *)ha->init_cb;

	icb->request_q_outpointer = __constant_cpu_to_le16(0);

	icb->response_q_inpointer = __constant_cpu_to_le16(0);

	icb->request_q_outpointer = cpu_to_le16(0);

	icb->response_q_inpointer = cpu_to_le16(0);

	icb->request_q_length = cpu_to_le16(req->length);

	icb->response_q_length = cpu_to_le16(rsp->length);

	icb->request_q_address[0] = cpu_to_le32(LSD(req->dma));
@@ -2105,18 +2105,17 @@ qla24xx_config_rings(struct scsi_qla_host *vha) 
	icb->response_q_address[1] = cpu_to_le32(MSD(rsp->dma));



	/* Setup ATIO queue dma pointers for target mode */

	icb->atio_q_inpointer = __constant_cpu_to_le16(0);

	icb->atio_q_inpointer = cpu_to_le16(0);

	icb->atio_q_length = cpu_to_le16(ha->tgt.atio_q_length);

	icb->atio_q_address[0] = cpu_to_le32(LSD(ha->tgt.atio_dma));

	icb->atio_q_address[1] = cpu_to_le32(MSD(ha->tgt.atio_dma));



	if (IS_SHADOW_REG_CAPABLE(ha))

		icb->firmware_options_2 |=

		    __constant_cpu_to_le32(BIT_30|BIT_29);

		icb->firmware_options_2 |= cpu_to_le32(BIT_30|BIT_29);



	if (ha->mqenable || IS_QLA83XX(ha) || IS_QLA27XX(ha)) {

		icb->qos = __constant_cpu_to_le16(QLA_DEFAULT_QUE_QOS);

		icb->rid = __constant_cpu_to_le16(rid);

		icb->qos = cpu_to_le16(QLA_DEFAULT_QUE_QOS);

		icb->rid = cpu_to_le16(rid);

		if (ha->flags.msix_enabled) {

			msix = &ha->msix_entries[1];

			ql_dbg(ql_dbg_init, vha, 0x00fd,
@@ -2126,26 +2125,22 @@ qla24xx_config_rings(struct scsi_qla_host *vha) 
		}

		/* Use alternate PCI bus number */

		if (MSB(rid))

			icb->firmware_options_2 |=

				__constant_cpu_to_le32(BIT_19);

			icb->firmware_options_2 |= cpu_to_le32(BIT_19);

		/* Use alternate PCI devfn */

		if (LSB(rid))

			icb->firmware_options_2 |=

				__constant_cpu_to_le32(BIT_18);

			icb->firmware_options_2 |= cpu_to_le32(BIT_18);



		/* Use Disable MSIX Handshake mode for capable adapters */

		if ((ha->fw_attributes & BIT_6) && (IS_MSIX_NACK_CAPABLE(ha)) &&

		    (ha->flags.msix_enabled)) {

			icb->firmware_options_2 &=

				__constant_cpu_to_le32(~BIT_22);

			icb->firmware_options_2 &= cpu_to_le32(~BIT_22);

			ha->flags.disable_msix_handshake = 1;

			ql_dbg(ql_dbg_init, vha, 0x00fe,

			    "MSIX Handshake Disable Mode turned on.\n");

		} else {

			icb->firmware_options_2 |=

				__constant_cpu_to_le32(BIT_22);

			icb->firmware_options_2 |= cpu_to_le32(BIT_22);

		}

		icb->firmware_options_2 |= __constant_cpu_to_le32(BIT_23);

		icb->firmware_options_2 |= cpu_to_le32(BIT_23);



		WRT_REG_DWORD(&reg->isp25mq.req_q_in, 0);

		WRT_REG_DWORD(&reg->isp25mq.req_q_out, 0);
@@ -2243,7 +2238,7 @@ qla2x00_init_rings(scsi_qla_host_t *vha) 
	}



	if (IS_FWI2_CAPABLE(ha)) {

		mid_init_cb->options = __constant_cpu_to_le16(BIT_1);

		mid_init_cb->options = cpu_to_le16(BIT_1);

		mid_init_cb->init_cb.execution_throttle =

		    cpu_to_le16(ha->fw_xcb_count);

		/* D-Port Status */
@@ -2672,8 +2667,8 @@ qla2x00_nvram_config(scsi_qla_host_t *vha) 
			nv->frame_payload_size = 1024;

		}



		nv->max_iocb_allocation = __constant_cpu_to_le16(256);

		nv->execution_throttle = __constant_cpu_to_le16(16);

		nv->max_iocb_allocation = cpu_to_le16(256);

		nv->execution_throttle = cpu_to_le16(16);

		nv->retry_count = 8;

		nv->retry_delay = 1;
@@ -2691,7 +2686,7 @@ qla2x00_nvram_config(scsi_qla_host_t *vha) 
		nv->host_p[1] = BIT_2;

		nv->reset_delay = 5;

		nv->port_down_retry_count = 8;

		nv->max_luns_per_target = __constant_cpu_to_le16(8);

		nv->max_luns_per_target = cpu_to_le16(8);

		nv->link_down_timeout = 60;



		rval = 1;
@@ -2819,7 +2814,7 @@ qla2x00_nvram_config(scsi_qla_host_t *vha) 
	memcpy(vha->node_name, icb->node_name, WWN_SIZE);

	memcpy(vha->port_name, icb->port_name, WWN_SIZE);



	icb->execution_throttle = __constant_cpu_to_le16(0xFFFF);

	icb->execution_throttle = cpu_to_le16(0xFFFF);



	ha->retry_count = nv->retry_count;
@@ -2871,10 +2866,10 @@ qla2x00_nvram_config(scsi_qla_host_t *vha) 
	if (ql2xloginretrycount)

		ha->login_retry_count = ql2xloginretrycount;



	icb->lun_enables = __constant_cpu_to_le16(0);

	icb->lun_enables = cpu_to_le16(0);

	icb->command_resource_count = 0;

	icb->immediate_notify_resource_count = 0;

	icb->timeout = __constant_cpu_to_le16(0);

	icb->timeout = cpu_to_le16(0);



	if (IS_QLA2100(ha) || IS_QLA2200(ha)) {

		/* Enable RIO */
@@ -5005,7 +5000,7 @@ qla24xx_nvram_config(scsi_qla_host_t *vha) 
	/* Bad NVRAM data, set defaults parameters. */

	if (chksum || nv->id[0] != 'I' || nv->id[1] != 'S' || nv->id[2] != 'P'

	    || nv->id[3] != ' ' ||

	    nv->nvram_version < __constant_cpu_to_le16(ICB_VERSION)) {

	    nv->nvram_version < cpu_to_le16(ICB_VERSION)) {

		/* Reset NVRAM data. */

		ql_log(ql_log_warn, vha, 0x006b,

		    "Inconsistent NVRAM detected: checksum=0x%x id=%c "
@@ -5018,12 +5013,12 @@ qla24xx_nvram_config(scsi_qla_host_t *vha) 
		 * Set default initialization control block.

		 */

		memset(nv, 0, ha->nvram_size);

		nv->nvram_version = __constant_cpu_to_le16(ICB_VERSION);

		nv->version = __constant_cpu_to_le16(ICB_VERSION);

		nv->nvram_version = cpu_to_le16(ICB_VERSION);

		nv->version = cpu_to_le16(ICB_VERSION);

		nv->frame_payload_size = 2048;

		nv->execution_throttle = __constant_cpu_to_le16(0xFFFF);

		nv->exchange_count = __constant_cpu_to_le16(0);

		nv->hard_address = __constant_cpu_to_le16(124);

		nv->execution_throttle = cpu_to_le16(0xFFFF);

		nv->exchange_count = cpu_to_le16(0);

		nv->hard_address = cpu_to_le16(124);

		nv->port_name[0] = 0x21;

		nv->port_name[1] = 0x00 + ha->port_no + 1;

		nv->port_name[2] = 0x00;
@@ -5041,29 +5036,29 @@ qla24xx_nvram_config(scsi_qla_host_t *vha) 
		nv->node_name[6] = 0x55;

		nv->node_name[7] = 0x86;

		qla24xx_nvram_wwn_from_ofw(vha, nv);

		nv->login_retry_count = __constant_cpu_to_le16(8);

		nv->interrupt_delay_timer = __constant_cpu_to_le16(0);

		nv->login_timeout = __constant_cpu_to_le16(0);

		nv->login_retry_count = cpu_to_le16(8);

		nv->interrupt_delay_timer = cpu_to_le16(0);

		nv->login_timeout = cpu_to_le16(0);

		nv->firmware_options_1 =

		    __constant_cpu_to_le32(BIT_14|BIT_13|BIT_2|BIT_1);

		nv->firmware_options_2 = __constant_cpu_to_le32(2 << 4);

		nv->firmware_options_2 |= __constant_cpu_to_le32(BIT_12);

		nv->firmware_options_3 = __constant_cpu_to_le32(2 << 13);

		nv->host_p = __constant_cpu_to_le32(BIT_11|BIT_10);

		nv->efi_parameters = __constant_cpu_to_le32(0);

		    cpu_to_le32(BIT_14|BIT_13|BIT_2|BIT_1);

		nv->firmware_options_2 = cpu_to_le32(2 << 4);

		nv->firmware_options_2 |= cpu_to_le32(BIT_12);

		nv->firmware_options_3 = cpu_to_le32(2 << 13);

		nv->host_p = cpu_to_le32(BIT_11|BIT_10);

		nv->efi_parameters = cpu_to_le32(0);

		nv->reset_delay = 5;

		nv->max_luns_per_target = __constant_cpu_to_le16(128);

		nv->port_down_retry_count = __constant_cpu_to_le16(30);

		nv->link_down_timeout = __constant_cpu_to_le16(30);

		nv->max_luns_per_target = cpu_to_le16(128);

		nv->port_down_retry_count = cpu_to_le16(30);

		nv->link_down_timeout = cpu_to_le16(30);



		rval = 1;

	}



	if (!qla_ini_mode_enabled(vha)) {

		/* Don't enable full login after initial LIP */

		nv->firmware_options_1 &= __constant_cpu_to_le32(~BIT_13);

		nv->firmware_options_1 &= cpu_to_le32(~BIT_13);

		/* Don't enable LIP full login for initiator */

		nv->host_p &= __constant_cpu_to_le32(~BIT_10);

		nv->host_p &= cpu_to_le32(~BIT_10);

	}



	qlt_24xx_config_nvram_stage1(vha, nv);
@@ -5097,14 +5092,14 @@ qla24xx_nvram_config(scsi_qla_host_t *vha) 


	qlt_24xx_config_nvram_stage2(vha, icb);



	if (nv->host_p & __constant_cpu_to_le32(BIT_15)) {

	if (nv->host_p & cpu_to_le32(BIT_15)) {

		/* Use alternate WWN? */

		memcpy(icb->node_name, nv->alternate_node_name, WWN_SIZE);

		memcpy(icb->port_name, nv->alternate_port_name, WWN_SIZE);

	}



	/* Prepare nodename */

	if ((icb->firmware_options_1 & __constant_cpu_to_le32(BIT_14)) == 0) {

	if ((icb->firmware_options_1 & cpu_to_le32(BIT_14)) == 0) {

		/*

		 * Firmware will apply the following mask if the nodename was

		 * not provided.
@@ -5136,7 +5131,7 @@ qla24xx_nvram_config(scsi_qla_host_t *vha) 
	memcpy(vha->node_name, icb->node_name, WWN_SIZE);

	memcpy(vha->port_name, icb->port_name, WWN_SIZE);



	icb->execution_throttle = __constant_cpu_to_le16(0xFFFF);

	icb->execution_throttle = cpu_to_le16(0xFFFF);



	ha->retry_count = le16_to_cpu(nv->login_retry_count);
@@ -5144,7 +5139,7 @@ qla24xx_nvram_config(scsi_qla_host_t *vha) 
	if (le16_to_cpu(nv->login_timeout) < ql2xlogintimeout)

		nv->login_timeout = cpu_to_le16(ql2xlogintimeout);

	if (le16_to_cpu(nv->login_timeout) < 4)

		nv->login_timeout = __constant_cpu_to_le16(4);

		nv->login_timeout = cpu_to_le16(4);

	ha->login_timeout = le16_to_cpu(nv->login_timeout);

	icb->login_timeout = nv->login_timeout;
@@ -5195,7 +5190,7 @@ qla24xx_nvram_config(scsi_qla_host_t *vha) 
		ha->zio_timer = le16_to_cpu(icb->interrupt_delay_timer) ?

		    le16_to_cpu(icb->interrupt_delay_timer): 2;

	}

	icb->firmware_options_2 &= __constant_cpu_to_le32(

	icb->firmware_options_2 &= cpu_to_le32(

	    ~(BIT_3 | BIT_2 | BIT_1 | BIT_0));

	vha->flags.process_response_queue = 0;

	if (ha->zio_mode != QLA_ZIO_DISABLED) {
@@ -5951,7 +5946,7 @@ qla81xx_nvram_config(scsi_qla_host_t *vha) 
	/* Bad NVRAM data, set defaults parameters. */

	if (chksum || nv->id[0] != 'I' || nv->id[1] != 'S' || nv->id[2] != 'P'

	    || nv->id[3] != ' ' ||

	    nv->nvram_version < __constant_cpu_to_le16(ICB_VERSION)) {

	    nv->nvram_version < cpu_to_le16(ICB_VERSION)) {

		/* Reset NVRAM data. */

		ql_log(ql_log_info, vha, 0x0073,

		    "Inconsistent NVRAM detected: checksum=0x%x id=%c "
@@ -5965,11 +5960,11 @@ qla81xx_nvram_config(scsi_qla_host_t *vha) 
		 * Set default initialization control block.

		 */

		memset(nv, 0, ha->nvram_size);

		nv->nvram_version = __constant_cpu_to_le16(ICB_VERSION);

		nv->version = __constant_cpu_to_le16(ICB_VERSION);

		nv->nvram_version = cpu_to_le16(ICB_VERSION);

		nv->version = cpu_to_le16(ICB_VERSION);

		nv->frame_payload_size = 2048;

		nv->execution_throttle = __constant_cpu_to_le16(0xFFFF);

		nv->exchange_count = __constant_cpu_to_le16(0);

		nv->execution_throttle = cpu_to_le16(0xFFFF);

		nv->exchange_count = cpu_to_le16(0);

		nv->port_name[0] = 0x21;

		nv->port_name[1] = 0x00 + ha->port_no + 1;

		nv->port_name[2] = 0x00;
@@ -5986,20 +5981,20 @@ qla81xx_nvram_config(scsi_qla_host_t *vha) 
		nv->node_name[5] = 0x1c;

		nv->node_name[6] = 0x55;

		nv->node_name[7] = 0x86;

		nv->login_retry_count = __constant_cpu_to_le16(8);

		nv->interrupt_delay_timer = __constant_cpu_to_le16(0);

		nv->login_timeout = __constant_cpu_to_le16(0);

		nv->login_retry_count = cpu_to_le16(8);

		nv->interrupt_delay_timer = cpu_to_le16(0);

		nv->login_timeout = cpu_to_le16(0);

		nv->firmware_options_1 =

		    __constant_cpu_to_le32(BIT_14|BIT_13|BIT_2|BIT_1);

		nv->firmware_options_2 = __constant_cpu_to_le32(2 << 4);

		nv->firmware_options_2 |= __constant_cpu_to_le32(BIT_12);

		nv->firmware_options_3 = __constant_cpu_to_le32(2 << 13);

		nv->host_p = __constant_cpu_to_le32(BIT_11|BIT_10);

		nv->efi_parameters = __constant_cpu_to_le32(0);

		    cpu_to_le32(BIT_14|BIT_13|BIT_2|BIT_1);

		nv->firmware_options_2 = cpu_to_le32(2 << 4);

		nv->firmware_options_2 |= cpu_to_le32(BIT_12);

		nv->firmware_options_3 = cpu_to_le32(2 << 13);

		nv->host_p = cpu_to_le32(BIT_11|BIT_10);

		nv->efi_parameters = cpu_to_le32(0);

		nv->reset_delay = 5;

		nv->max_luns_per_target = __constant_cpu_to_le16(128);

		nv->port_down_retry_count = __constant_cpu_to_le16(30);

		nv->link_down_timeout = __constant_cpu_to_le16(180);

		nv->max_luns_per_target = cpu_to_le16(128);

		nv->port_down_retry_count = cpu_to_le16(30);

		nv->link_down_timeout = cpu_to_le16(180);

		nv->enode_mac[0] = 0x00;

		nv->enode_mac[1] = 0xC0;

		nv->enode_mac[2] = 0xDD;
@@ -6058,13 +6053,13 @@ qla81xx_nvram_config(scsi_qla_host_t *vha) 
	qlt_81xx_config_nvram_stage2(vha, icb);



	/* Use alternate WWN? */

	if (nv->host_p & __constant_cpu_to_le32(BIT_15)) {

	if (nv->host_p & cpu_to_le32(BIT_15)) {

		memcpy(icb->node_name, nv->alternate_node_name, WWN_SIZE);

		memcpy(icb->port_name, nv->alternate_port_name, WWN_SIZE);

	}



	/* Prepare nodename */

	if ((icb->firmware_options_1 & __constant_cpu_to_le32(BIT_14)) == 0) {

	if ((icb->firmware_options_1 & cpu_to_le32(BIT_14)) == 0) {

		/*

		 * Firmware will apply the following mask if the nodename was

		 * not provided.
@@ -6093,7 +6088,7 @@ qla81xx_nvram_config(scsi_qla_host_t *vha) 
	memcpy(vha->node_name, icb->node_name, WWN_SIZE);

	memcpy(vha->port_name, icb->port_name, WWN_SIZE);



	icb->execution_throttle = __constant_cpu_to_le16(0xFFFF);

	icb->execution_throttle = cpu_to_le16(0xFFFF);



	ha->retry_count = le16_to_cpu(nv->login_retry_count);
@@ -6101,7 +6096,7 @@ qla81xx_nvram_config(scsi_qla_host_t *vha) 
	if (le16_to_cpu(nv->login_timeout) < ql2xlogintimeout)

		nv->login_timeout = cpu_to_le16(ql2xlogintimeout);

	if (le16_to_cpu(nv->login_timeout) < 4)

		nv->login_timeout = __constant_cpu_to_le16(4);

		nv->login_timeout = cpu_to_le16(4);

	ha->login_timeout = le16_to_cpu(nv->login_timeout);

	icb->login_timeout = nv->login_timeout;
@@ -6147,7 +6142,7 @@ qla81xx_nvram_config(scsi_qla_host_t *vha) 


	/* if not running MSI-X we need handshaking on interrupts */

	if (!vha->hw->flags.msix_enabled && (IS_QLA83XX(ha) || IS_QLA27XX(ha)))

		icb->firmware_options_2 |= __constant_cpu_to_le32(BIT_22);

		icb->firmware_options_2 |= cpu_to_le32(BIT_22);



	/* Enable ZIO. */

	if (!vha->flags.init_done) {
@@ -6156,7 +6151,7 @@ qla81xx_nvram_config(scsi_qla_host_t *vha) 
		ha->zio_timer = le16_to_cpu(icb->interrupt_delay_timer) ?

		    le16_to_cpu(icb->interrupt_delay_timer): 2;

	}

	icb->firmware_options_2 &= __constant_cpu_to_le32(

	icb->firmware_options_2 &= cpu_to_le32(

	    ~(BIT_3 | BIT_2 | BIT_1 | BIT_0));

	vha->flags.process_response_queue = 0;

	if (ha->zio_mode != QLA_ZIO_DISABLED) {

drivers/scsi/qla2xxx/qla_iocb.c

+38 −50

File changed.

Preview size limit exceeded, changes collapsed.

drivers/scsi/qla2xxx/qla_isr.c

+1 −1
Original line number Diff line number Diff line
@@ -1564,7 +1564,7 @@ qla24xx_tm_iocb_entry(scsi_qla_host_t *vha, struct req_que *req, void *tsk) 
		    "Async-%s error - hdl=%x entry-status(%x).\n",

		    type, sp->handle, sts->entry_status);

		iocb->u.tmf.data = QLA_FUNCTION_FAILED;

	} else if (sts->comp_status != __constant_cpu_to_le16(CS_COMPLETE)) {

	} else if (sts->comp_status != cpu_to_le16(CS_COMPLETE)) {

		ql_log(ql_log_warn, fcport->vha, 0x5039,

		    "Async-%s error - hdl=%x completion status(%x).\n",

		    type, sp->handle, sts->comp_status);