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

scsi: qla2xxx: Cast explicitly to uint16_t / uint32_t 

Casting a pointer to void * and relying on an implicit cast from void *
to uint16_t or uint32_t suppresses sparse warnings about endianness. Hence
cast explicitly to uint16_t and uint32_t. Additionally, remove superfluous
void * casts.

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


Cc: Arun Easi <aeasi@marvell.com>
Cc: Nilesh Javali <njavali@marvell.com>
Cc: Daniel Wagner <dwagner@suse.de>
Cc: Himanshu Madhani <himanshu.madhani@oracle.com>
Cc: Martin Wilck <mwilck@suse.com>
Cc: Roman Bolshakov <r.bolshakov@yadro.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 04474d3a

drivers/scsi/qla2xxx/qla_dbg.c

+2 −2
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ qla27xx_dump_mpi_ram(struct qla_hw_data *ha, uint32_t addr, uint32_t *ram, 
{

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

	dma_addr_t dump_dma = ha->gid_list_dma;

	uint32_t *chunk = (void *)ha->gid_list;

	uint32_t *chunk = (uint32_t *)ha->gid_list;

	uint32_t dwords = qla2x00_gid_list_size(ha) / 4;

	uint32_t stat;

	ulong i, j, timer = 6000000;
@@ -195,7 +195,7 @@ qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint32_t *ram, 
	int rval = QLA_FUNCTION_FAILED;

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

	dma_addr_t dump_dma = ha->gid_list_dma;

	uint32_t *chunk = (void *)ha->gid_list;

	uint32_t *chunk = (uint32_t *)ha->gid_list;

	uint32_t dwords = qla2x00_gid_list_size(ha) / 4;

	uint32_t stat;

	ulong i, j, timer = 6000000;

drivers/scsi/qla2xxx/qla_init.c

+13 −13
Original line number Diff line number Diff line
@@ -992,7 +992,7 @@ static void qla24xx_async_gnl_sp_done(srb_t *sp, int res) 


		ql_dbg(ql_dbg_disc, vha, 0x20e8,

		    "%s %8phC %02x:%02x:%02x CLS %x/%x lid %x \n",

		    __func__, (void *)&wwn, e->port_id[2], e->port_id[1],

		    __func__, &wwn, e->port_id[2], e->port_id[1],

		    e->port_id[0], e->current_login_state, e->last_login_state,

		    (loop_id & 0x7fff));

	}
@@ -1343,7 +1343,7 @@ int qla24xx_async_gpdb(struct scsi_qla_host *vha, fc_port_t *fcport, u8 opt) 
	mb[9] = vha->vp_idx;

	mb[10] = opt;



	mbx->u.mbx.in = (void *)pd;

	mbx->u.mbx.in = pd;

	mbx->u.mbx.in_dma = pd_dma;



	sp->done = qla24xx_async_gpdb_sp_done;
@@ -4128,7 +4128,7 @@ qla2x00_init_rings(scsi_qla_host_t *vha) 
		req = ha->req_q_map[que];

		if (!req || !test_bit(que, ha->req_qid_map))

			continue;

		req->out_ptr = (void *)(req->ring + req->length);

		req->out_ptr = (uint16_t *)(req->ring + req->length);

		*req->out_ptr = 0;

		for (cnt = 1; cnt < req->num_outstanding_cmds; cnt++)

			req->outstanding_cmds[cnt] = NULL;
@@ -4145,7 +4145,7 @@ qla2x00_init_rings(scsi_qla_host_t *vha) 
		rsp = ha->rsp_q_map[que];

		if (!rsp || !test_bit(que, ha->rsp_qid_map))

			continue;

		rsp->in_ptr = (void *)(rsp->ring + rsp->length);

		rsp->in_ptr = (uint16_t *)(rsp->ring + rsp->length);

		*rsp->in_ptr = 0;

		/* Initialize response queue entries */

		if (IS_QLAFX00(ha))
@@ -7446,7 +7446,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 = (void *)image_status;

	uint32_t *p = (uint32_t *)image_status;

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

	uint32_t sum = 0;
@@ -7509,7 +7509,7 @@ qla28xx_get_aux_images( 
		goto check_sec_image;

	}



	qla24xx_read_flash_data(vha, (void *)&pri_aux_image_status,

	qla24xx_read_flash_data(vha, (uint32_t *)&pri_aux_image_status,

	    ha->flt_region_aux_img_status_pri,

	    sizeof(pri_aux_image_status) >> 2);

	qla27xx_print_image(vha, "Primary aux image", &pri_aux_image_status);
@@ -7542,7 +7542,7 @@ qla28xx_get_aux_images( 
		goto check_valid_image;

	}



	qla24xx_read_flash_data(vha, (void *)&sec_aux_image_status,

	qla24xx_read_flash_data(vha, (uint32_t *)&sec_aux_image_status,

	    ha->flt_region_aux_img_status_sec,

	    sizeof(sec_aux_image_status) >> 2);

	qla27xx_print_image(vha, "Secondary aux image", &sec_aux_image_status);
@@ -7607,7 +7607,7 @@ qla27xx_get_active_image(struct scsi_qla_host *vha, 
		goto check_sec_image;

	}



	if (qla24xx_read_flash_data(vha, (void *)(&pri_image_status),

	if (qla24xx_read_flash_data(vha, (uint32_t *)&pri_image_status,

	    ha->flt_region_img_status_pri, sizeof(pri_image_status) >> 2) !=

	    QLA_SUCCESS) {

		WARN_ON_ONCE(true);
@@ -7714,7 +7714,7 @@ qla24xx_load_risc_flash(scsi_qla_host_t *vha, uint32_t *srisc_addr, 
	ql_dbg(ql_dbg_init, vha, 0x008b,

	    "FW: Loading firmware from flash (%x).\n", faddr);



	dcode = (void *)req->ring;

	dcode = (uint32_t *)req->ring;

	qla24xx_read_flash_data(vha, dcode, faddr, 8);

	if (qla24xx_risc_firmware_invalid(dcode)) {

		ql_log(ql_log_fatal, vha, 0x008c,
@@ -7727,7 +7727,7 @@ qla24xx_load_risc_flash(scsi_qla_host_t *vha, uint32_t *srisc_addr, 
		return QLA_FUNCTION_FAILED;

	}



	dcode = (void *)req->ring;

	dcode = (uint32_t *)req->ring;

	*srisc_addr = 0;

	segments = FA_RISC_CODE_SEGMENTS;

	for (j = 0; j < segments; j++) {
@@ -7778,7 +7778,7 @@ qla24xx_load_risc_flash(scsi_qla_host_t *vha, uint32_t *srisc_addr, 
		fwdt->template = NULL;

		fwdt->length = 0;



		dcode = (void *)req->ring;

		dcode = (uint32_t *)req->ring;

		qla24xx_read_flash_data(vha, dcode, faddr, 7);

		risc_size = be32_to_cpu(dcode[2]);

		ql_dbg(ql_dbg_init, vha, 0x0161,
@@ -7970,7 +7970,7 @@ qla24xx_load_risc_blob(scsi_qla_host_t *vha, uint32_t *srisc_addr) 
		return QLA_FUNCTION_FAILED;

	}



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

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

	dcode = fwcode;

	if (qla24xx_risc_firmware_invalid(dcode)) {

		ql_log(ql_log_fatal, vha, 0x0093,
@@ -7982,7 +7982,7 @@ qla24xx_load_risc_blob(scsi_qla_host_t *vha, uint32_t *srisc_addr) 
		return QLA_FUNCTION_FAILED;

	}



	dcode = (void *)req->ring;

	dcode = (uint32_t *)req->ring;

	*srisc_addr = 0;

	segments = FA_RISC_CODE_SEGMENTS;

	for (j = 0; j < segments; j++) {

drivers/scsi/qla2xxx/qla_mbx.c

+3 −3
Original line number Diff line number Diff line
@@ -3038,7 +3038,7 @@ qla2x00_get_link_status(scsi_qla_host_t *vha, uint16_t loop_id, 
	int rval;

	mbx_cmd_t mc;

	mbx_cmd_t *mcp = &mc;

	uint32_t *iter = (void *)stats;

	uint32_t *iter = (uint32_t *)stats;

	ushort dwords = offsetof(typeof(*stats), link_up_cnt)/sizeof(*iter);

	struct qla_hw_data *ha = vha->hw;
@@ -3097,7 +3097,7 @@ qla24xx_get_isp_stats(scsi_qla_host_t *vha, struct link_statistics *stats, 
	int rval;

	mbx_cmd_t mc;

	mbx_cmd_t *mcp = &mc;

	uint32_t *iter = (void *)stats;

	uint32_t *iter = (uint32_t *)stats;

	ushort dwords = sizeof(*stats)/sizeof(*iter);



	ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1088,
@@ -4736,7 +4736,7 @@ qla82xx_set_driver_version(scsi_qla_host_t *vha, char *version) 
	ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x117b,

	    "Entered %s.\n", __func__);



	str = (void *)version;

	str = (uint16_t *)version;

	len = strlen(version);



	mcp->mb[0] = MBC_SET_RNID_PARAMS;

drivers/scsi/qla2xxx/qla_mid.c

+2 −2
Original line number Diff line number Diff line
@@ -770,7 +770,7 @@ qla25xx_create_req_que(struct qla_hw_data *ha, uint16_t options, 
	req->req_q_in = &reg->isp25mq.req_q_in;

	req->req_q_out = &reg->isp25mq.req_q_out;

	req->max_q_depth = ha->req_q_map[0]->max_q_depth;

	req->out_ptr = (void *)(req->ring + req->length);

	req->out_ptr = (uint16_t *)(req->ring + req->length);

	mutex_unlock(&ha->mq_lock);

	ql_dbg(ql_dbg_multiq, base_vha, 0xc004,

	    "ring_ptr=%p ring_index=%d, "
@@ -884,7 +884,7 @@ qla25xx_create_rsp_que(struct qla_hw_data *ha, uint16_t options, 
	reg = ISP_QUE_REG(ha, que_id);

	rsp->rsp_q_in = &reg->isp25mq.rsp_q_in;

	rsp->rsp_q_out = &reg->isp25mq.rsp_q_out;

	rsp->in_ptr = (void *)(rsp->ring + rsp->length);

	rsp->in_ptr = (uint16_t *)(rsp->ring + rsp->length);

	mutex_unlock(&ha->mq_lock);

	ql_dbg(ql_dbg_multiq, base_vha, 0xc00b,

	    "options=%x id=%d rsp_q_in=%p rsp_q_out=%p\n",

drivers/scsi/qla2xxx/qla_mr.c

+2 −2
Original line number Diff line number Diff line
@@ -3212,7 +3212,7 @@ qlafx00_tm_iocb(srb_t *sp, struct tsk_mgmt_entry_fx00 *ptm_iocb) 
		    sizeof(struct scsi_lun));

	}



	memcpy((void *)ptm_iocb, &tm_iocb,

	memcpy(ptm_iocb, &tm_iocb,

	    sizeof(struct tsk_mgmt_entry_fx00));

	wmb();

}
@@ -3234,7 +3234,7 @@ qlafx00_abort_iocb(srb_t *sp, struct abort_iocb_entry_fx00 *pabt_iocb) 
	abt_iocb.tgt_id_sts = cpu_to_le16(sp->fcport->tgt_id);

	abt_iocb.req_que_no = cpu_to_le16(req->id);



	memcpy((void *)pabt_iocb, &abt_iocb,

	memcpy(pabt_iocb, &abt_iocb,

	    sizeof(struct abort_iocb_entry_fx00));

	wmb();

}