Commit 7ffa5b93 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Fix endianness annotations in source files 

Fix all endianness complaints reported by sparse (C=2) without affecting
the behavior of the code on little endian CPUs.

Link: https://lore.kernel.org/r/20200518211712.11395-16-bvanassche@acm.org


Cc: Nilesh Javali <njavali@marvell.com>
Cc: Quinn Tran <qutran@marvell.com>
Cc: Martin Wilck <mwilck@suse.com>
Cc: Daniel Wagner <dwagner@suse.de>
Cc: Roman Bolshakov <r.bolshakov@yadro.com>
Reviewed-by: default avatarHimanshu Madhani <himanshu.madhani@oracle.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarDaniel Wagner <dwagner@suse.de>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 21038b09

drivers/scsi/qla2xxx/qla_attr.c

+1 −2
Original line number Diff line number Diff line
@@ -227,10 +227,9 @@ qla2x00_sysfs_write_nvram(struct file *filp, struct kobject *kobj, 


	/* Checksum NVRAM. */

	if (IS_FWI2_CAPABLE(ha)) {

		uint32_t *iter;

		__le32 *iter = (__force __le32 *)buf;

		uint32_t chksum;



		iter = (uint32_t *)buf;

		chksum = 0;

		for (cnt = 0; cnt < ((count >> 2) - 1); cnt++, iter++)

			chksum += le32_to_cpu(*iter);

drivers/scsi/qla2xxx/qla_bsg.c

+2 −2
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ qla2x00_process_ct(struct bsg_job *bsg_job) 
			>> 24;

	switch (loop_id) {

	case 0xFC:

		loop_id = cpu_to_le16(NPH_SNS);

		loop_id = NPH_SNS;

		break;

	case 0xFA:

		loop_id = vha->mgmt_svr_loop_id;
@@ -2042,7 +2042,7 @@ qlafx00_mgmt_cmd(struct bsg_job *bsg_job) 


	/* Initialize all required  fields of fcport */

	fcport->vha = vha;

	fcport->loop_id = piocb_rqst->dataword;

	fcport->loop_id = le32_to_cpu(piocb_rqst->dataword);



	sp->type = SRB_FXIOCB_BCMD;

	sp->name = "bsg_fx_mgmt";

drivers/scsi/qla2xxx/qla_dbg.c

+44 −43
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ qla27xx_dump_mpi_ram(struct qla_hw_data *ha, uint32_t addr, uint32_t *ram, 
}



int

qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint32_t *ram,

qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, __be32 *ram,

		 uint32_t ram_dwords, void **nxt)

{

	int rval = QLA_FUNCTION_FAILED;
@@ -254,9 +254,9 @@ 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) || IS_QLA28XX(ha)) ?

			    chunk[j] : swab32(chunk[j]);

			ram[i + j] = (__force __be32)

				((IS_QLA27XX(ha) || IS_QLA28XX(ha)) ?

				 chunk[j] : swab32(chunk[j]));

		}

	}
@@ -265,7 +265,7 @@ qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint32_t *ram, 
}



static int

qla24xx_dump_memory(struct qla_hw_data *ha, uint32_t *code_ram,

qla24xx_dump_memory(struct qla_hw_data *ha, __be32 *code_ram,

		    uint32_t cram_size, void **nxt)

{

	int rval;
@@ -286,11 +286,11 @@ qla24xx_dump_memory(struct qla_hw_data *ha, uint32_t *code_ram, 
	return rval;

}



static uint32_t *

static __be32 *

qla24xx_read_window(struct device_reg_24xx __iomem *reg, uint32_t iobase,

    uint32_t count, uint32_t *buf)

		    uint32_t count, __be32 *buf)

{

	uint32_t __iomem *dmp_reg;

	__le32 __iomem *dmp_reg;



	wrt_reg_dword(&reg->iobase_addr, iobase);

	dmp_reg = &reg->iobase_window;
@@ -368,7 +368,7 @@ qla24xx_soft_reset(struct qla_hw_data *ha) 
}



static int

qla2xxx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint16_t *ram,

qla2xxx_dump_ram(struct qla_hw_data *ha, uint32_t addr, __be16 *ram,

    uint32_t ram_words, void **nxt)

{

	int rval;
@@ -376,7 +376,7 @@ qla2xxx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint16_t *ram, 
	uint16_t mb0;

	struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;

	dma_addr_t dump_dma = ha->gid_list_dma;

	uint16_t *dump = (uint16_t *)ha->gid_list;

	__le16 *dump = (__force __le16 *)ha->gid_list;



	rval = QLA_SUCCESS;

	mb0 = 0;
@@ -441,7 +441,8 @@ qla2xxx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint16_t *ram, 
		if (test_and_clear_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags)) {

			rval = mb0 & MBS_MASK;

			for (idx = 0; idx < words; idx++)

				ram[cnt + idx] = swab16(dump[idx]);

				ram[cnt + idx] =

					cpu_to_be16(le16_to_cpu(dump[idx]));

		} else {

			rval = QLA_FUNCTION_FAILED;

		}
@@ -453,9 +454,9 @@ qla2xxx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint16_t *ram, 


static inline void

qla2xxx_read_window(struct device_reg_2xxx __iomem *reg, uint32_t count,

    uint16_t *buf)

		    __be16 *buf)

{

	uint16_t __iomem *dmp_reg = &reg->u.isp2300.fb_cmd;

	__le16 __iomem *dmp_reg = &reg->u.isp2300.fb_cmd;



	for ( ; count--; dmp_reg++)

		*buf++ = htons(rd_reg_word(dmp_reg));
@@ -472,10 +473,10 @@ qla24xx_copy_eft(struct qla_hw_data *ha, void *ptr) 
}



static inline void *

qla25xx_copy_fce(struct qla_hw_data *ha, void *ptr, uint32_t **last_chain)

qla25xx_copy_fce(struct qla_hw_data *ha, void *ptr, __be32 **last_chain)

{

	uint32_t cnt;

	uint32_t *iter_reg;

	__be32 *iter_reg;

	struct qla2xxx_fce_chain *fcec = ptr;



	if (!ha->fce)
@@ -499,7 +500,7 @@ qla25xx_copy_fce(struct qla_hw_data *ha, void *ptr, uint32_t **last_chain) 
}



static inline void *

qla25xx_copy_exlogin(struct qla_hw_data *ha, void *ptr, uint32_t **last_chain)

qla25xx_copy_exlogin(struct qla_hw_data *ha, void *ptr, __be32 **last_chain)

{

	struct qla2xxx_offld_chain *c = ptr;
@@ -517,11 +518,11 @@ qla25xx_copy_exlogin(struct qla_hw_data *ha, void *ptr, uint32_t **last_chain) 
	ptr += sizeof(struct qla2xxx_offld_chain);

	memcpy(ptr, ha->exlogin_buf, ha->exlogin_size);



	return (char *)ptr + cpu_to_be32(c->size);

	return (char *)ptr + be32_to_cpu(c->size);

}



static inline void *

qla81xx_copy_exchoffld(struct qla_hw_data *ha, void *ptr, uint32_t **last_chain)

qla81xx_copy_exchoffld(struct qla_hw_data *ha, void *ptr, __be32 **last_chain)

{

	struct qla2xxx_offld_chain *c = ptr;
@@ -539,12 +540,12 @@ qla81xx_copy_exchoffld(struct qla_hw_data *ha, void *ptr, uint32_t **last_chain) 
	ptr += sizeof(struct qla2xxx_offld_chain);

	memcpy(ptr, ha->exchoffld_buf, ha->exchoffld_size);



	return (char *)ptr + cpu_to_be32(c->size);

	return (char *)ptr + be32_to_cpu(c->size);

}



static inline void *

qla2xxx_copy_atioqueues(struct qla_hw_data *ha, void *ptr,

	uint32_t **last_chain)

			__be32 **last_chain)

{

	struct qla2xxx_mqueue_chain *q;

	struct qla2xxx_mqueue_header *qh;
@@ -591,7 +592,7 @@ qla2xxx_copy_atioqueues(struct qla_hw_data *ha, void *ptr, 
}



static inline void *

qla25xx_copy_mqueues(struct qla_hw_data *ha, void *ptr, uint32_t **last_chain)

qla25xx_copy_mqueues(struct qla_hw_data *ha, void *ptr, __be32 **last_chain)

{

	struct qla2xxx_mqueue_chain *q;

	struct qla2xxx_mqueue_header *qh;
@@ -662,7 +663,7 @@ qla25xx_copy_mqueues(struct qla_hw_data *ha, void *ptr, uint32_t **last_chain) 
}



static inline void *

qla25xx_copy_mq(struct qla_hw_data *ha, void *ptr, uint32_t **last_chain)

qla25xx_copy_mq(struct qla_hw_data *ha, void *ptr, __be32 **last_chain)

{

	uint32_t cnt, que_idx;

	uint8_t que_cnt;
@@ -736,7 +737,7 @@ qla2300_fw_dump(scsi_qla_host_t *vha) 
	uint32_t	cnt;

	struct qla_hw_data *ha = vha->hw;

	struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;

	uint16_t __iomem *dmp_reg;

	__le16 __iomem *dmp_reg;

	struct qla2300_fw_dump	*fw;

	void		*nxt;

	struct scsi_qla_host *base_vha = pci_get_drvdata(ha->pdev);
@@ -893,7 +894,7 @@ qla2100_fw_dump(scsi_qla_host_t *vha) 
	uint16_t	mb0 = 0, mb2 = 0;

	struct qla_hw_data *ha = vha->hw;

	struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;

	uint16_t __iomem *dmp_reg;

	__le16 __iomem *dmp_reg;

	struct qla2100_fw_dump	*fw;

	struct scsi_qla_host *base_vha = pci_get_drvdata(ha->pdev);
@@ -1074,13 +1075,13 @@ qla24xx_fw_dump(scsi_qla_host_t *vha) 
	uint32_t	cnt;

	struct qla_hw_data *ha = vha->hw;

	struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;

	uint32_t __iomem *dmp_reg;

	uint32_t	*iter_reg;

	uint16_t __iomem *mbx_reg;

	__le32 __iomem *dmp_reg;

	__be32		*iter_reg;

	__le16 __iomem *mbx_reg;

	struct qla24xx_fw_dump *fw;

	void		*nxt;

	void		*nxt_chain;

	uint32_t	*last_chain = NULL;

	__be32		*last_chain = NULL;

	struct scsi_qla_host *base_vha = pci_get_drvdata(ha->pdev);



	lockdep_assert_held(&ha->hardware_lock);
@@ -1320,12 +1321,12 @@ qla25xx_fw_dump(scsi_qla_host_t *vha) 
	uint32_t	cnt;

	struct qla_hw_data *ha = vha->hw;

	struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;

	uint32_t __iomem *dmp_reg;

	uint32_t	*iter_reg;

	uint16_t __iomem *mbx_reg;

	__le32 __iomem *dmp_reg;

	__be32		*iter_reg;

	__le16 __iomem *mbx_reg;

	struct qla25xx_fw_dump *fw;

	void		*nxt, *nxt_chain;

	uint32_t	*last_chain = NULL;

	__be32		*last_chain = NULL;

	struct scsi_qla_host *base_vha = pci_get_drvdata(ha->pdev);



	lockdep_assert_held(&ha->hardware_lock);
@@ -1633,12 +1634,12 @@ qla81xx_fw_dump(scsi_qla_host_t *vha) 
	uint32_t	cnt;

	struct qla_hw_data *ha = vha->hw;

	struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;

	uint32_t __iomem *dmp_reg;

	uint32_t	*iter_reg;

	uint16_t __iomem *mbx_reg;

	__le32 __iomem *dmp_reg;

	__be32		*iter_reg;

	__le16 __iomem *mbx_reg;

	struct qla81xx_fw_dump *fw;

	void		*nxt, *nxt_chain;

	uint32_t	*last_chain = NULL;

	__be32		*last_chain = NULL;

	struct scsi_qla_host *base_vha = pci_get_drvdata(ha->pdev);



	lockdep_assert_held(&ha->hardware_lock);
@@ -1948,12 +1949,12 @@ qla83xx_fw_dump(scsi_qla_host_t *vha) 
	uint32_t	cnt;

	struct qla_hw_data *ha = vha->hw;

	struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;

	uint32_t __iomem *dmp_reg;

	uint32_t	*iter_reg;

	uint16_t __iomem *mbx_reg;

	__le32 __iomem *dmp_reg;

	__be32		*iter_reg;

	__le16 __iomem *mbx_reg;

	struct qla83xx_fw_dump *fw;

	void		*nxt, *nxt_chain;

	uint32_t	*last_chain = NULL;

	__be32		*last_chain = NULL;

	struct scsi_qla_host *base_vha = pci_get_drvdata(ha->pdev);



	lockdep_assert_held(&ha->hardware_lock);
@@ -2659,7 +2660,7 @@ ql_dump_regs(uint level, scsi_qla_host_t *vha, uint id) 
	struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;

	struct device_reg_24xx __iomem *reg24 = &ha->iobase->isp24;

	struct device_reg_82xx __iomem *reg82 = &ha->iobase->isp82;

	uint16_t __iomem *mbx_reg;

	__le16 __iomem *mbx_reg;



	if (!ql_mask_match(level))

		return;

drivers/scsi/qla2xxx/qla_init.c

+31 −28
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static void qla24xx_abort_iocb_timeout(void *data) 
	if (sp->cmd_sp)

		sp->cmd_sp->done(sp->cmd_sp, QLA_OS_TIMER_EXPIRED);



	abt->u.abt.comp_status = CS_TIMEOUT;

	abt->u.abt.comp_status = cpu_to_le16(CS_TIMEOUT);

	sp->done(sp, QLA_OS_TIMER_EXPIRED);

}
@@ -1791,7 +1791,7 @@ qla2x00_tmf_iocb_timeout(void *data) 
			}

		}

		spin_unlock_irqrestore(sp->qpair->qp_lock_ptr, flags);

		tmf->u.tmf.comp_status = CS_TIMEOUT;

		tmf->u.tmf.comp_status = cpu_to_le16(CS_TIMEOUT);

		tmf->u.tmf.data = QLA_FUNCTION_FAILED;

		complete(&tmf->u.tmf.comp);

	}
@@ -4093,7 +4093,7 @@ qla24xx_config_rings(struct scsi_qla_host *vha) 
		ql_dbg(ql_dbg_init, vha, 0x00fd,

		    "Speed set by user : %s Gbps \n",

		    qla2x00_get_link_speed_str(ha, ha->set_data_rate));

		icb->firmware_options_3 = (ha->set_data_rate << 13);

		icb->firmware_options_3 = cpu_to_le32(ha->set_data_rate << 13);

	}



	/* PCI posting */
@@ -4184,12 +4184,14 @@ qla2x00_init_rings(scsi_qla_host_t *vha) 
		mid_init_cb->init_cb.execution_throttle =

		    cpu_to_le16(ha->cur_fw_xcb_count);

		ha->flags.dport_enabled =

		    (mid_init_cb->init_cb.firmware_options_1 & BIT_7) != 0;

			(le32_to_cpu(mid_init_cb->init_cb.firmware_options_1) &

			 BIT_7) != 0;

		ql_dbg(ql_dbg_init, vha, 0x0191, "DPORT Support: %s.\n",

		    (ha->flags.dport_enabled) ? "enabled" : "disabled");

		/* FA-WWPN Status */

		ha->flags.fawwpn_enabled =

		    (mid_init_cb->init_cb.firmware_options_1 & BIT_6) != 0;

			(le32_to_cpu(mid_init_cb->init_cb.firmware_options_1) &

			 BIT_6) != 0;

		ql_dbg(ql_dbg_init, vha, 0x00bc, "FA-WWPN Support: %s.\n",

		    (ha->flags.fawwpn_enabled) ? "enabled" : "disabled");

	}
@@ -7154,7 +7156,7 @@ qla24xx_nvram_config(scsi_qla_host_t *vha) 
	int   rval;

	struct init_cb_24xx *icb;

	struct nvram_24xx *nv;

	uint32_t *dptr;

	__le32 *dptr;

	uint8_t  *dptr1, *dptr2;

	uint32_t chksum;

	uint16_t cnt;
@@ -7182,7 +7184,7 @@ qla24xx_nvram_config(scsi_qla_host_t *vha) 
	    ha->nvram_base - FA_NVRAM_FUNC0_ADDR, FA_NVRAM_VPD_SIZE * 4);



	/* Get NVRAM data into cache and calculate checksum. */

	dptr = (uint32_t *)nv;

	dptr = (__force __le32 *)nv;

	ha->isp_ops->read_nvram(vha, dptr, ha->nvram_base, ha->nvram_size);

	for (cnt = 0, chksum = 0; cnt < ha->nvram_size >> 2; cnt++, dptr++)

		chksum += le32_to_cpu(*dptr);
@@ -7210,7 +7212,7 @@ qla24xx_nvram_config(scsi_qla_host_t *vha) 
		memset(nv, 0, ha->nvram_size);

		nv->nvram_version = cpu_to_le16(ICB_VERSION);

		nv->version = cpu_to_le16(ICB_VERSION);

		nv->frame_payload_size = 2048;

		nv->frame_payload_size = cpu_to_le16(2048);

		nv->execution_throttle = cpu_to_le16(0xFFFF);

		nv->exchange_count = cpu_to_le16(0);

		nv->hard_address = cpu_to_le16(124);
@@ -7378,7 +7380,7 @@ qla24xx_nvram_config(scsi_qla_host_t *vha) 
		ha->login_retry_count = ql2xloginretrycount;



	/* N2N: driver will initiate Login instead of FW */

	icb->firmware_options_3 |= BIT_8;

	icb->firmware_options_3 |= cpu_to_le32(BIT_8);



	/* Enable ZIO. */

	if (!vha->flags.init_done) {
@@ -7446,7 +7448,7 @@ qla27xx_check_image_status_signature(struct qla27xx_image_status *image_status) 
static ulong

qla27xx_image_status_checksum(struct qla27xx_image_status *image_status)

{

	uint32_t *p = (uint32_t *)image_status;

	__le32 *p = (__force __le32 *)image_status;

	uint n = sizeof(*image_status) / sizeof(*p);

	uint32_t sum = 0;
@@ -7734,11 +7736,11 @@ qla24xx_load_risc_flash(scsi_qla_host_t *vha, uint32_t *srisc_addr, 
		ql_dbg(ql_dbg_init, vha, 0x008d,

		    "-> Loading segment %u...\n", j);

		qla24xx_read_flash_data(vha, dcode, faddr, 10);

		risc_addr = be32_to_cpu(dcode[2]);

		risc_size = be32_to_cpu(dcode[3]);

		risc_addr = be32_to_cpu((__force __be32)dcode[2]);

		risc_size = be32_to_cpu((__force __be32)dcode[3]);

		if (!*srisc_addr) {

			*srisc_addr = risc_addr;

			risc_attr = be32_to_cpu(dcode[9]);

			risc_attr = be32_to_cpu((__force __be32)dcode[9]);

		}



		dlen = ha->fw_transfer_size >> 2;
@@ -7780,7 +7782,7 @@ qla24xx_load_risc_flash(scsi_qla_host_t *vha, uint32_t *srisc_addr, 


		dcode = (uint32_t *)req->ring;

		qla24xx_read_flash_data(vha, dcode, faddr, 7);

		risc_size = be32_to_cpu(dcode[2]);

		risc_size = be32_to_cpu((__force __be32)dcode[2]);

		ql_dbg(ql_dbg_init, vha, 0x0161,

		    "-> fwdt%u template array at %#x (%#x dwords)\n",

		    j, faddr, risc_size);
@@ -7849,7 +7851,8 @@ qla2x00_load_risc(scsi_qla_host_t *vha, uint32_t *srisc_addr) 
{

	int	rval;

	int	i, fragment;

	uint16_t *wcode, *fwcode;

	uint16_t *wcode;

	__be16	 *fwcode;

	uint32_t risc_addr, risc_size, fwclen, wlen, *seg;

	struct fw_blob *blob;

	struct qla_hw_data *ha = vha->hw;
@@ -7869,7 +7872,7 @@ qla2x00_load_risc(scsi_qla_host_t *vha, uint32_t *srisc_addr) 


	wcode = (uint16_t *)req->ring;

	*srisc_addr = 0;

	fwcode = (uint16_t *)blob->fw->data;

	fwcode = (__force __be16 *)blob->fw->data;

	fwclen = 0;



	/* Validate firmware image by checking version. */
@@ -7917,7 +7920,7 @@ qla2x00_load_risc(scsi_qla_host_t *vha, uint32_t *srisc_addr) 
			    "words 0x%x.\n", risc_addr, wlen);



			for (i = 0; i < wlen; i++)

				wcode[i] = swab16(fwcode[i]);

				wcode[i] = swab16((__force u32)fwcode[i]);



			rval = qla2x00_load_ram(vha, req->dma, risc_addr,

			    wlen);
@@ -7954,7 +7957,7 @@ qla24xx_load_risc_blob(scsi_qla_host_t *vha, uint32_t *srisc_addr) 
	ulong i;

	uint j;

	struct fw_blob *blob;

	uint32_t *fwcode;

	__be32 *fwcode;

	struct qla_hw_data *ha = vha->hw;

	struct req_que *req = ha->req_q_map[0];

	struct fwdt *fwdt = ha->fwdt;
@@ -7970,8 +7973,8 @@ qla24xx_load_risc_blob(scsi_qla_host_t *vha, uint32_t *srisc_addr) 
		return QLA_FUNCTION_FAILED;

	}



	fwcode = (uint32_t *)blob->fw->data;

	dcode = fwcode;

	fwcode = (__force __be32 *)blob->fw->data;

	dcode = (__force uint32_t *)fwcode;

	if (qla24xx_risc_firmware_invalid(dcode)) {

		ql_log(ql_log_fatal, vha, 0x0093,

		    "Unable to verify integrity of firmware image (%zd).\n",
@@ -8008,7 +8011,7 @@ qla24xx_load_risc_blob(scsi_qla_host_t *vha, uint32_t *srisc_addr) 
			    dlen);



			for (i = 0; i < dlen; i++)

				dcode[i] = swab32(fwcode[i]);

				dcode[i] = swab32((__force u32)fwcode[i]);



			rval = qla2x00_load_ram(vha, req->dma, risc_addr, dlen);

			if (rval) {
@@ -8062,7 +8065,7 @@ qla24xx_load_risc_blob(scsi_qla_host_t *vha, uint32_t *srisc_addr) 


		dcode = fwdt->template;

		for (i = 0; i < risc_size; i++)

			dcode[i] = fwcode[i];

			dcode[i] = (__force u32)fwcode[i];



		if (!qla27xx_fwdt_template_valid(dcode)) {

			ql_log(ql_log_warn, vha, 0x0175,
@@ -8333,7 +8336,7 @@ qla81xx_nvram_config(scsi_qla_host_t *vha) 
	int   rval;

	struct init_cb_81xx *icb;

	struct nvram_81xx *nv;

	uint32_t *dptr;

	__le32 *dptr;

	uint8_t  *dptr1, *dptr2;

	uint32_t chksum;

	uint16_t cnt;
@@ -8380,7 +8383,7 @@ qla81xx_nvram_config(scsi_qla_host_t *vha) 
	    "primary" : "secondary");

	ha->isp_ops->read_optrom(vha, ha->nvram, faddr << 2, ha->nvram_size);



	dptr = (uint32_t *)nv;

	dptr = (__force __le32 *)nv;

	for (cnt = 0, chksum = 0; cnt < ha->nvram_size >> 2; cnt++, dptr++)

		chksum += le32_to_cpu(*dptr);
@@ -8407,7 +8410,7 @@ qla81xx_nvram_config(scsi_qla_host_t *vha) 
		memset(nv, 0, ha->nvram_size);

		nv->nvram_version = cpu_to_le16(ICB_VERSION);

		nv->version = cpu_to_le16(ICB_VERSION);

		nv->frame_payload_size = 2048;

		nv->frame_payload_size = cpu_to_le16(2048);

		nv->execution_throttle = cpu_to_le16(0xFFFF);

		nv->exchange_count = cpu_to_le16(0);

		nv->port_name[0] = 0x21;
@@ -8451,7 +8454,7 @@ qla81xx_nvram_config(scsi_qla_host_t *vha) 
	}



	if (IS_T10_PI_CAPABLE(ha))

		nv->frame_payload_size &= ~7;

		nv->frame_payload_size &= cpu_to_le16(~7);



	qlt_81xx_config_nvram_stage1(vha, nv);
@@ -8614,10 +8617,10 @@ qla81xx_nvram_config(scsi_qla_host_t *vha) 
	}



	 /* enable RIDA Format2 */

	icb->firmware_options_3 |= BIT_0;

	icb->firmware_options_3 |= cpu_to_le32(BIT_0);



	/* N2N: driver will initiate Login instead of FW */

	icb->firmware_options_3 |= BIT_8;

	icb->firmware_options_3 |= cpu_to_le32(BIT_8);



	/* Determine NVMe/FCP priority for target ports */

	ha->fc4_type_priority = qla2xxx_get_fc4_priority(vha);

drivers/scsi/qla2xxx/qla_iocb.c

+37 −34
Original line number Diff line number Diff line
@@ -661,7 +661,7 @@ qla24xx_build_scsi_type_6_iocbs(srb_t *sp, struct cmd_type_6 *cmd_pkt, 
	cur_dsd->address = 0;

	cur_dsd->length = 0;

	cur_dsd++;

	cmd_pkt->control_flags |= CF_DATA_SEG_DESCR_ENABLE;

	cmd_pkt->control_flags |= cpu_to_le16(CF_DATA_SEG_DESCR_ENABLE);

	return 0;

}
@@ -755,8 +755,8 @@ qla24xx_build_scsi_iocbs(srb_t *sp, struct cmd_type_7 *cmd_pkt, 
}



struct fw_dif_context {

	uint32_t ref_tag;

	uint16_t app_tag;

	__le32	ref_tag;

	__le16	app_tag;

	uint8_t ref_tag_mask[4];	/* Validation/Replacement Mask*/

	uint8_t app_tag_mask[2];	/* Validation/Replacement Mask*/

};
@@ -1389,7 +1389,7 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt, 
    uint16_t tot_dsds, uint16_t tot_prot_dsds, uint16_t fw_prot_opts)

{

	struct dsd64		*cur_dsd;

	uint32_t		*fcp_dl;

	__be32			*fcp_dl;

	scsi_qla_host_t		*vha;

	struct scsi_cmnd	*cmd;

	uint32_t		total_bytes = 0;
@@ -1456,7 +1456,7 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt, 
	    &crc_ctx_pkt->ref_tag, tot_prot_dsds);



	put_unaligned_le64(crc_ctx_dma, &cmd_pkt->crc_context_address);

	cmd_pkt->crc_context_len = CRC_CONTEXT_LEN_FW;

	cmd_pkt->crc_context_len = cpu_to_le16(CRC_CONTEXT_LEN_FW);



	/* Determine SCSI command length -- align to 4 byte boundary */

	if (cmd->cmd_len > 16) {
@@ -1545,7 +1545,7 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt, 
	crc_ctx_pkt->guard_seed = cpu_to_le16(0);

	/* Fibre channel byte count */

	cmd_pkt->byte_count = cpu_to_le32(total_bytes);

	fcp_dl = (uint32_t *)(crc_ctx_pkt->fcp_cmnd.cdb + 16 +

	fcp_dl = (__be32 *)(crc_ctx_pkt->fcp_cmnd.cdb + 16 +

	    additional_fcpcdb_len);

	*fcp_dl = htonl(total_bytes);
@@ -2344,9 +2344,10 @@ qla24xx_prli_iocb(srb_t *sp, struct logio_entry_24xx *logio) 
	logio->entry_type = LOGINOUT_PORT_IOCB_TYPE;

	logio->control_flags = cpu_to_le16(LCF_COMMAND_PRLI);

	if (lio->u.logio.flags & SRB_LOGIN_NVME_PRLI) {

		logio->control_flags |= LCF_NVME_PRLI;

		logio->control_flags |= cpu_to_le16(LCF_NVME_PRLI);

		if (sp->vha->flags.nvme_first_burst)

			logio->io_parameter[0] = NVME_PRLI_SP_FIRST_BURST;

			logio->io_parameter[0] =

				cpu_to_le32(NVME_PRLI_SP_FIRST_BURST);

	}



	logio->nport_handle = cpu_to_le16(sp->fcport->loop_id);
@@ -2680,7 +2681,7 @@ qla24xx_els_logo_iocb(srb_t *sp, struct els_entry_24xx *els_iocb) 
	els_iocb->entry_status = 0;

	els_iocb->handle = sp->handle;

	els_iocb->nport_handle = cpu_to_le16(sp->fcport->loop_id);

	els_iocb->tx_dsd_count = 1;

	els_iocb->tx_dsd_count = cpu_to_le16(1);

	els_iocb->vp_index = vha->vp_idx;

	els_iocb->sof_type = EST_SOFI3;

	els_iocb->rx_dsd_count = 0;
@@ -2700,7 +2701,7 @@ qla24xx_els_logo_iocb(srb_t *sp, struct els_entry_24xx *els_iocb) 
			cpu_to_le32(sizeof(struct els_plogi_payload));

		put_unaligned_le64(elsio->u.els_plogi.els_plogi_pyld_dma,

				   &els_iocb->tx_address);

		els_iocb->rx_dsd_count = 1;

		els_iocb->rx_dsd_count = cpu_to_le16(1);

		els_iocb->rx_byte_count = els_iocb->rx_len =

			cpu_to_le32(sizeof(struct els_plogi_payload));

		put_unaligned_le64(elsio->u.els_plogi.els_resp_pyld_dma,
@@ -2712,7 +2713,7 @@ qla24xx_els_logo_iocb(srb_t *sp, struct els_entry_24xx *els_iocb) 
		    (uint8_t *)els_iocb,

		    sizeof(*els_iocb));

	} else {

		els_iocb->control_flags = 1 << 13;

		els_iocb->control_flags = cpu_to_le16(1 << 13);

		els_iocb->tx_byte_count =

			cpu_to_le32(sizeof(struct els_logo_payload));

		put_unaligned_le64(elsio->u.els_logo.els_logo_pyld_dma,
@@ -2787,7 +2788,7 @@ static void qla2x00_els_dcmd2_sp_done(srb_t *sp, int res) 
	struct qla_work_evt *e;

	struct fc_port *conflict_fcport;

	port_id_t cid;	/* conflict Nport id */

	u32 *fw_status = sp->u.iocb_cmd.u.els_plogi.fw_status;

	const __le32 *fw_status = sp->u.iocb_cmd.u.els_plogi.fw_status;

	u16 lid;



	ql_dbg(ql_dbg_disc, vha, 0x3072,
@@ -2800,7 +2801,7 @@ static void qla2x00_els_dcmd2_sp_done(srb_t *sp, int res) 
	if (sp->flags & SRB_WAKEUP_ON_COMP)

		complete(&lio->u.els_plogi.comp);

	else {

		switch (fw_status[0]) {

		switch (le32_to_cpu(fw_status[0])) {

		case CS_DATA_UNDERRUN:

		case CS_COMPLETE:

			memset(&ea, 0, sizeof(ea));
@@ -2810,9 +2811,9 @@ static void qla2x00_els_dcmd2_sp_done(srb_t *sp, int res) 
			break;



		case CS_IOCB_ERROR:

			switch (fw_status[1]) {

			switch (le32_to_cpu(fw_status[1])) {

			case LSC_SCODE_PORTID_USED:

				lid = fw_status[2] & 0xffff;

				lid = le32_to_cpu(fw_status[2]) & 0xffff;

				qlt_find_sess_invalidate_other(vha,

				    wwn_to_u64(fcport->port_name),

				    fcport->d_id, lid, &conflict_fcport);
@@ -2846,9 +2847,11 @@ static void qla2x00_els_dcmd2_sp_done(srb_t *sp, int res) 
				break;



			case LSC_SCODE_NPORT_USED:

				cid.b.domain = (fw_status[2] >> 16) & 0xff;

				cid.b.area   = (fw_status[2] >>  8) & 0xff;

				cid.b.al_pa  = fw_status[2] & 0xff;

				cid.b.domain = (le32_to_cpu(fw_status[2]) >> 16)

					& 0xff;

				cid.b.area   = (le32_to_cpu(fw_status[2]) >>  8)

					& 0xff;

				cid.b.al_pa  = le32_to_cpu(fw_status[2]) & 0xff;

				cid.b.rsvd_1 = 0;



				ql_dbg(ql_dbg_disc, vha, 0x20ec,
@@ -3216,7 +3219,7 @@ qla82xx_start_scsi(srb_t *sp) 
	uint16_t	tot_dsds;

	struct device_reg_82xx __iomem *reg;

	uint32_t dbval;

	uint32_t *fcp_dl;

	__be32 *fcp_dl;

	uint8_t additional_cdb_len;

	struct ct6_dsd *ctx;

	struct scsi_qla_host *vha = sp->vha;
@@ -3398,7 +3401,7 @@ qla82xx_start_scsi(srb_t *sp) 


		memcpy(ctx->fcp_cmnd->cdb, cmd->cmnd, cmd->cmd_len);



		fcp_dl = (uint32_t *)(ctx->fcp_cmnd->cdb + 16 +

		fcp_dl = (__be32 *)(ctx->fcp_cmnd->cdb + 16 +

		    additional_cdb_len);

		*fcp_dl = htonl((uint32_t)scsi_bufflen(cmd));
@@ -3536,7 +3539,7 @@ qla24xx_abort_iocb(srb_t *sp, struct abort_entry_24xx *abt_iocb) 
	memset(abt_iocb, 0, sizeof(struct abort_entry_24xx));

	abt_iocb->entry_type = ABORT_IOCB_TYPE;

	abt_iocb->entry_count = 1;

	abt_iocb->handle = cpu_to_le32(make_handle(req->id, sp->handle));

	abt_iocb->handle = make_handle(req->id, sp->handle);

	if (sp->fcport) {

		abt_iocb->nport_handle = cpu_to_le16(sp->fcport->loop_id);

		abt_iocb->port_id[0] = sp->fcport->d_id.b.al_pa;
@@ -3544,10 +3547,10 @@ qla24xx_abort_iocb(srb_t *sp, struct abort_entry_24xx *abt_iocb) 
		abt_iocb->port_id[2] = sp->fcport->d_id.b.domain;

	}

	abt_iocb->handle_to_abort =

	    cpu_to_le32(make_handle(aio->u.abt.req_que_no,

				    aio->u.abt.cmd_hndl));

		make_handle(le16_to_cpu(aio->u.abt.req_que_no),

			    aio->u.abt.cmd_hndl);

	abt_iocb->vp_index = vha->vp_idx;

	abt_iocb->req_que_no = cpu_to_le16(aio->u.abt.req_que_no);

	abt_iocb->req_que_no = aio->u.abt.req_que_no;

	/* Send the command to the firmware */

	wmb();

}
@@ -3562,7 +3565,7 @@ qla2x00_mb_iocb(srb_t *sp, struct mbx_24xx_entry *mbx) 
	sz = min(ARRAY_SIZE(mbx->mb), ARRAY_SIZE(sp->u.iocb_cmd.u.mbx.out_mb));



	for (i = 0; i < sz; i++)

		mbx->mb[i] = cpu_to_le16(sp->u.iocb_cmd.u.mbx.out_mb[i]);

		mbx->mb[i] = sp->u.iocb_cmd.u.mbx.out_mb[i];

}



static void
@@ -3586,7 +3589,7 @@ static void qla2x00_send_notify_ack_iocb(srb_t *sp, 
	nack->u.isp24.nport_handle = ntfy->u.isp24.nport_handle;

	if (le16_to_cpu(ntfy->u.isp24.status) == IMM_NTFY_ELS) {

		nack->u.isp24.flags = ntfy->u.isp24.flags &

			cpu_to_le32(NOTIFY24XX_FLAGS_PUREX_IOCB);

			cpu_to_le16(NOTIFY24XX_FLAGS_PUREX_IOCB);

	}

	nack->u.isp24.srr_rx_id = ntfy->u.isp24.srr_rx_id;

	nack->u.isp24.status = ntfy->u.isp24.status;
@@ -3613,20 +3616,20 @@ qla_nvme_ls(srb_t *sp, struct pt_ls4_request *cmd_pkt) 
	nvme = &sp->u.iocb_cmd;

	cmd_pkt->entry_type = PT_LS4_REQUEST;

	cmd_pkt->entry_count = 1;

	cmd_pkt->control_flags = CF_LS4_ORIGINATOR << CF_LS4_SHIFT;

	cmd_pkt->control_flags = cpu_to_le16(CF_LS4_ORIGINATOR << CF_LS4_SHIFT);



	cmd_pkt->timeout = cpu_to_le16(nvme->u.nvme.timeout_sec);

	cmd_pkt->nport_handle = cpu_to_le16(sp->fcport->loop_id);

	cmd_pkt->vp_index = sp->fcport->vha->vp_idx;



	cmd_pkt->tx_dseg_count = 1;

	cmd_pkt->tx_byte_count = nvme->u.nvme.cmd_len;

	cmd_pkt->dsd[0].length = nvme->u.nvme.cmd_len;

	cmd_pkt->tx_dseg_count = cpu_to_le16(1);

	cmd_pkt->tx_byte_count = cpu_to_le32(nvme->u.nvme.cmd_len);

	cmd_pkt->dsd[0].length = cpu_to_le32(nvme->u.nvme.cmd_len);

	put_unaligned_le64(nvme->u.nvme.cmd_dma, &cmd_pkt->dsd[0].address);



	cmd_pkt->rx_dseg_count = 1;

	cmd_pkt->rx_byte_count = nvme->u.nvme.rsp_len;

	cmd_pkt->dsd[1].length  = nvme->u.nvme.rsp_len;

	cmd_pkt->rx_dseg_count = cpu_to_le16(1);

	cmd_pkt->rx_byte_count = cpu_to_le32(nvme->u.nvme.rsp_len);

	cmd_pkt->dsd[1].length = cpu_to_le32(nvme->u.nvme.rsp_len);

	put_unaligned_le64(nvme->u.nvme.rsp_dma, &cmd_pkt->dsd[1].address);



	return rval;