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

Commit c7ee3bd4 authored by Quinn Tran's avatar Quinn Tran Committed by Christoph Hellwig
Browse files

qla2xxx: fix sparse warnings introduced by previous target mode t10-dif patch 



Fix sparse warnings introduce by "qla2xxx: T10-Dif: add T10-PI support".

Signed-off-by: default avatarQuinn Tran <quinn.tran@qlogic.com>
Signed-off-by: default avatarSaurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 3fb4b161

drivers/scsi/qla2xxx/qla_def.h

+8 −8
Original line number Diff line number Diff line
@@ -1648,16 +1648,16 @@ typedef struct { 
 */

struct crc_context {

	uint32_t handle;		/* System handle. */

	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*/

	uint16_t guard_seed;		/* Initial Guard Seed */

	uint16_t prot_opts;		/* Requested Data Protection Mode */

	uint16_t blk_size;		/* Data size in bytes */

	__le16 guard_seed;		/* Initial Guard Seed */

	__le16 prot_opts;		/* Requested Data Protection Mode */

	__le16 blk_size;		/* Data size in bytes */

	uint16_t runt_blk_guard;	/* Guard value for runt block (tape

					 * only) */

	uint32_t byte_count;		/* Total byte count/ total data

	__le32 byte_count;		/* Total byte count/ total data

					 * transfer count */

	union {

		struct {
@@ -1671,10 +1671,10 @@ struct crc_context { 
			uint32_t	reserved_6;

		} nobundling;

		struct {

			uint32_t	dif_byte_count;	/* Total DIF byte

			__le32	dif_byte_count;	/* Total DIF byte

							 * count */

			uint16_t	reserved_1;

			uint16_t	dseg_count;	/* Data segment count */

			__le16	dseg_count;	/* Data segment count */

			uint32_t	reserved_2;

			uint32_t	data_address[2];

			uint32_t	data_length;

drivers/scsi/qla2xxx/qla_target.c

+10 −5
Original line number Diff line number Diff line
@@ -1997,7 +1997,7 @@ qlt_set_t10dif_tags(struct se_cmd *se_cmd, struct crc_context *ctx) 
	 * have been immplemented by TCM, before AppTag is avail.

	 * Look for modesense_handlers[]

	 */

	ctx->app_tag = __constant_cpu_to_le16(0);

	ctx->app_tag = 0;

	ctx->app_tag_mask[0] = 0x0;

	ctx->app_tag_mask[1] = 0x0;
@@ -2079,6 +2079,7 @@ qlt_build_ctio_crc2_pkt(struct qla_tgt_prm *prm, scsi_qla_host_t *vha) 
	struct se_cmd		*se_cmd = &cmd->se_cmd;

	uint32_t h;

	struct atio_from_isp *atio = &prm->cmd->atio;

	uint16_t t16;



	sgc = 0;

	ha = vha->hw;
@@ -2175,8 +2176,13 @@ qlt_build_ctio_crc2_pkt(struct qla_tgt_prm *prm, scsi_qla_host_t *vha) 
	pkt->initiator_id[1] = atio->u.isp24.fcp_hdr.s_id[1];

	pkt->initiator_id[2] = atio->u.isp24.fcp_hdr.s_id[0];

	pkt->exchange_addr   = atio->u.isp24.exchange_addr;

	pkt->ox_id  = swab16(atio->u.isp24.fcp_hdr.ox_id);

	pkt->flags |= (atio->u.isp24.attr << 9);



	/* silence compile warning */

	t16 = be16_to_cpu(atio->u.isp24.fcp_hdr.ox_id);

	pkt->ox_id  = cpu_to_le16(t16);



	t16 = (atio->u.isp24.attr << 9);

	pkt->flags |= cpu_to_le16(t16);

	pkt->relative_offset = cpu_to_le32(prm->cmd->offset);



	/* Set transfer direction */
@@ -2251,8 +2257,7 @@ qlt_build_ctio_crc2_pkt(struct qla_tgt_prm *prm, scsi_qla_host_t *vha) 


	if (bundling && prm->prot_seg_cnt) {

		/* Walks dif segments */

		pkt->add_flags |=

			__constant_cpu_to_le16(CTIO_CRC2_AF_DIF_DSD_ENA);

		pkt->add_flags |= CTIO_CRC2_AF_DIF_DSD_ENA;



		cur_dsd = (uint32_t *) &crc_ctx_pkt->u.bundling.dif_address;

		if (qla24xx_walk_and_build_prot_sglist(ha, NULL, cur_dsd,

drivers/scsi/qla2xxx/qla_target.h

+8 −8
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ struct fcp_hdr { 
	uint8_t  seq_id;

	uint8_t  df_ctl;

	uint16_t seq_cnt;

	uint16_t ox_id;

	__be16   ox_id;

	uint16_t rx_id;

	uint32_t parameter;

} __packed;
@@ -441,7 +441,7 @@ struct ctio7_to_24xx { 
	union {

		struct {

			uint16_t reserved1;

			uint16_t flags;

			__le16 flags;

			uint32_t residual;

			uint16_t ox_id;

			uint16_t scsi_status;
@@ -527,7 +527,7 @@ struct ctio_crc2_to_fw { 


	uint32_t handle;		/* System handle. */

	uint16_t nport_handle;		/* N_PORT handle. */

	uint16_t timeout;		/* Command timeout. */

	__le16 timeout;		/* Command timeout. */



	uint16_t dseg_count;		/* Data segment count. */

	uint8_t  vp_index;
@@ -538,15 +538,15 @@ struct ctio_crc2_to_fw { 
	uint8_t  reserved1;

	uint32_t exchange_addr;		/* rcv exchange address */

	uint16_t reserved2;

	uint16_t flags;			/* refer to CTIO7 flags values */

	__le16 flags;			/* refer to CTIO7 flags values */

	uint32_t residual;

	uint16_t ox_id;

	__le16 ox_id;

	uint16_t scsi_status;

	uint32_t relative_offset;

	__le32 relative_offset;

	uint32_t reserved5;

	uint32_t transfer_length;		/* total fc transfer length */

	__le32 transfer_length;		/* total fc transfer length */

	uint32_t reserved6;

	uint32_t crc_context_address[2];/* Data segment address. */

	__le32 crc_context_address[2];/* Data segment address. */

	uint16_t crc_context_len;	/* Data segment length. */

	uint16_t reserved_1;		/* MUST be set to 0. */

} __packed;