From 0bc0a78cd7b22c81ddc6375166404589d50c8ce7 Mon Sep 17 00:00:00 2001

From: Himanshu Madhani <hmadhani@redhat.com>

Date: Thu, 1 Aug 2019 15:55:23 -0400

Subject: [PATCH 063/124] [scsi] scsi: qla2xxx: Use get/put_unaligned where

 appropriate

Message-id: <20190801155618.12650-64-hmadhani@redhat.com>

Patchwork-id: 267839

O-Subject: [RHEL 7.8 e-stor PATCH 063/118] scsi: qla2xxx: Use get/put_unaligned where appropriate

Bugzilla: 1729270

RH-Acked-by: Jarod Wilson <jarod@redhat.com>

RH-Acked-by: Tony Camuso <tcamuso@redhat.com>

From: Bart Van Assche <bvanassche@acm.org>

Bugzilla 1729270

This patch makes the code easier to read but does not change any

functionality.

Cc: Himanshu Madhani <hmadhani@marvell.com>

Cc: Giridhar Malavali <gmalavali@marvell.com>

Signed-off-by: Bart Van Assche <bvanassche@acm.org>

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

(cherry picked from commit 2c26348c4d090caeb308530ea893b37897e4a58d)

Signed-off-by: Himanshu Madhani <hmadhani@redhat.com>

Signed-off-by: Jan Stancek <jstancek@redhat.com>

---

 drivers/scsi/qla2xxx/qla_bsg.c  |  2 +-

 drivers/scsi/qla2xxx/qla_iocb.c | 21 +++++++++------------

 drivers/scsi/qla2xxx/qla_nvme.c |  4 ++--

 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c

index 4df08850825f..7f9acc8cfbe2 100644

--- a/drivers/scsi/qla2xxx/qla_bsg.c

+++ b/drivers/scsi/qla2xxx/qla_bsg.c

@@ -1025,7 +1025,7 @@ qla84xx_updatefw(struct fc_bsg_job *bsg_job)

 	}

 	flag = bsg_job->request->rqst_data.h_vendor.vendor_cmd[1];

-	fw_ver = le32_to_cpu(*((uint32_t *)((uint32_t *)fw_buf + 2)));

+	fw_ver = get_unaligned_le32((uint32_t *)fw_buf + 2);

 	mn->entry_type = VERIFY_CHIP_IOCB_TYPE;

 	mn->entry_count = 1;

diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c

index ec06bdc606f7..47558faacb4f 100644

--- a/drivers/scsi/qla2xxx/qla_iocb.c

+++ b/drivers/scsi/qla2xxx/qla_iocb.c

@@ -107,7 +107,7 @@ qla2x00_prep_cont_type0_iocb(struct scsi_qla_host *vha)

 	cont_pkt = (cont_entry_t *)req->ring_ptr;

 	/* Load packet defaults. */

-	*((uint32_t *)(&cont_pkt->entry_type)) = cpu_to_le32(CONTINUE_TYPE);

+	put_unaligned_le32(CONTINUE_TYPE, &cont_pkt->entry_type);

 	return (cont_pkt);

 }

@@ -136,9 +136,8 @@ qla2x00_prep_cont_type1_iocb(scsi_qla_host_t *vha, struct req_que *req)

 	cont_pkt = (cont_a64_entry_t *)req->ring_ptr;

 	/* Load packet defaults. */

-	*((uint32_t *)(&cont_pkt->entry_type)) = IS_QLAFX00(vha->hw) ?

-	    cpu_to_le32(CONTINUE_A64_TYPE_FX00) :

-	    cpu_to_le32(CONTINUE_A64_TYPE);

+	put_unaligned_le32(IS_QLAFX00(vha->hw) ? CONTINUE_A64_TYPE_FX00 :

+			   CONTINUE_A64_TYPE, &cont_pkt->entry_type);

 	return (cont_pkt);

 }

@@ -202,8 +201,7 @@ void qla2x00_build_scsi_iocbs_32(srb_t *sp, cmd_entry_t *cmd_pkt,

 	cmd = GET_CMD_SP(sp);

 	/* Update entry type to indicate Command Type 2 IOCB */

-	*((uint32_t *)(&cmd_pkt->entry_type)) =

-	    cpu_to_le32(COMMAND_TYPE);

+	put_unaligned_le32(COMMAND_TYPE, &cmd_pkt->entry_type);

 	/* No data transfer */

 	if (!scsi_bufflen(cmd) || cmd->sc_data_direction == DMA_NONE) {

@@ -260,7 +258,7 @@ void qla2x00_build_scsi_iocbs_64(srb_t *sp, cmd_entry_t *cmd_pkt,

 	cmd = GET_CMD_SP(sp);

 	/* Update entry type to indicate Command Type 3 IOCB */

-	*((uint32_t *)(&cmd_pkt->entry_type)) = cpu_to_le32(COMMAND_A64_TYPE);

+	put_unaligned_le32(COMMAND_A64_TYPE, &cmd_pkt->entry_type);

 	/* No data transfer */

 	if (!scsi_bufflen(cmd) || cmd->sc_data_direction == DMA_NONE) {

@@ -597,7 +595,7 @@ qla24xx_build_scsi_type_6_iocbs(srb_t *sp, struct cmd_type_6 *cmd_pkt,

 	cmd = GET_CMD_SP(sp);

 	/* Update entry type to indicate Command Type 3 IOCB */

-	*((uint32_t *)(&cmd_pkt->entry_type)) = cpu_to_le32(COMMAND_TYPE_6);

+	put_unaligned_le32(COMMAND_TYPE_6, &cmd_pkt->entry_type);

 	/* No data transfer */

 	if (!scsi_bufflen(cmd) || cmd->sc_data_direction == DMA_NONE) {

@@ -712,7 +710,7 @@ qla24xx_build_scsi_iocbs(srb_t *sp, struct cmd_type_7 *cmd_pkt,

 	cmd = GET_CMD_SP(sp);

 	/* Update entry type to indicate Command Type 3 IOCB */

-	*((uint32_t *)(&cmd_pkt->entry_type)) = cpu_to_le32(COMMAND_TYPE_7);

+	put_unaligned_le32(COMMAND_TYPE_7, &cmd_pkt->entry_type);

 	/* No data transfer */

 	if (!scsi_bufflen(cmd) || cmd->sc_data_direction == DMA_NONE) {

@@ -1435,7 +1433,7 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,

 	cmd = GET_CMD_SP(sp);

 	/* Update entry type to indicate Command Type CRC_2 IOCB */

-	*((uint32_t *)(&cmd_pkt->entry_type)) = cpu_to_le32(COMMAND_TYPE_CRC_2);

+	put_unaligned_le32(COMMAND_TYPE_CRC_2, &cmd_pkt->entry_type);

 	vha = sp->vha;

 	ha = vha->hw;

@@ -3818,8 +3816,7 @@ qla25xx_build_bidir_iocb(srb_t *sp, struct scsi_qla_host *vha,

 	struct fc_bsg_job *bsg_job = sp->u.bsg_job;

 	/*Update entry type to indicate bidir command */

-	*((uint32_t *)(&cmd_pkt->entry_type)) =

-		cpu_to_le32(COMMAND_BIDIRECTIONAL);

+	put_unaligned_le32(COMMAND_BIDIRECTIONAL, &cmd_pkt->entry_type);

 	/* Set the transfer direction, in this set both flags

 	 * Also set the BD_WRAP_BACK flag, firmware will take care

diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c

index 2e73b3ce52d1..cbde02279838 100644

--- a/drivers/scsi/qla2xxx/qla_nvme.c

+++ b/drivers/scsi/qla2xxx/qla_nvme.c

@@ -460,8 +460,8 @@ static inline int qla2x00_start_nvme_mq(srb_t *sp)

 				req->ring_ptr++;

 			}

 			cont_pkt = (cont_a64_entry_t *)req->ring_ptr;

-			*((uint32_t *)(&cont_pkt->entry_type)) =

-			    cpu_to_le32(CONTINUE_A64_TYPE);

+			put_unaligned_le32(CONTINUE_A64_TYPE,

+					   &cont_pkt->entry_type);

 			cur_dsd = (uint32_t *)cont_pkt->dseg_0_address;

 			avail_dsds = 5;

-- 

2.13.6