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

Commit 8270ee2a authored by Santosh Nayak's avatar Santosh Nayak Committed by James Bottomley
Browse files

[SCSI] pm8001: fix endian issue with code optimization. 



1. Fix endian issue.
2. Fix the following warning :
    " drivers/scsi/pm8001/pm8001_hwi.c:2932:32: warning: comparison
      between ‘enum sas_device_type’ and ‘enum sas_dev_type’".
3. Few code optimization.

Signed-off-by: default avatarSantosh Nayak <santoshprasadnayak@gmail.com>
Acked-by: default avatarJack Wang <jack_wang@usish.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 50ec5bab

drivers/scsi/pm8001/pm8001_chips.h

+2 −2
Original line number Diff line number Diff line
@@ -46,9 +46,9 @@ static inline u32 pm8001_read_32(void *virt_addr) 
	return *((u32 *)virt_addr);

}



static inline void pm8001_write_32(void *addr, u32 offset, u32 val)

static inline void pm8001_write_32(void *addr, u32 offset, __le32 val)

{

	*((u32 *)(addr + offset)) = val;

	*((__le32 *)(addr + offset)) = val;

}



static inline u32 pm8001_cr32(struct pm8001_hba_info *pm8001_ha, u32 bar,

drivers/scsi/pm8001/pm8001_hwi.c

+46 −43
Original line number Diff line number Diff line
@@ -1246,7 +1246,7 @@ static int mpi_msg_free_get(struct inbound_queue_table *circularQ, 
	consumer_index = pm8001_read_32(circularQ->ci_virt);

	circularQ->consumer_index = cpu_to_le32(consumer_index);

	if (((circularQ->producer_idx + bcCount) % 256) ==

		circularQ->consumer_index) {

		le32_to_cpu(circularQ->consumer_index)) {

		*messagePtr = NULL;

		return -1;

	}
@@ -1355,7 +1355,8 @@ static u32 mpi_msg_consume(struct pm8001_hba_info *pm8001_ha, 
	u32 header_tmp;

	do {

		/* If there are not-yet-delivered messages ... */

		if (circularQ->producer_index != circularQ->consumer_idx) {

		if (le32_to_cpu(circularQ->producer_index)

			!= circularQ->consumer_idx) {

			/*Get the pointer to the circular queue buffer element*/

			msgHeader = (struct mpi_msg_hdr *)

				(circularQ->base_virt +
@@ -1363,14 +1364,14 @@ static u32 mpi_msg_consume(struct pm8001_hba_info *pm8001_ha, 
			/* read header */

			header_tmp = pm8001_read_32(msgHeader);

			msgHeader_tmp = cpu_to_le32(header_tmp);

			if (0 != (msgHeader_tmp & 0x80000000)) {

			if (0 != (le32_to_cpu(msgHeader_tmp) & 0x80000000)) {

				if (OPC_OUB_SKIP_ENTRY !=

					(msgHeader_tmp & 0xfff)) {

					(le32_to_cpu(msgHeader_tmp) & 0xfff)) {

					*messagePtr1 =

						((u8 *)msgHeader) +

						sizeof(struct mpi_msg_hdr);

					*pBC = (u8)((msgHeader_tmp >> 24) &

						0x1f);

					*pBC = (u8)((le32_to_cpu(msgHeader_tmp)

						>> 24) & 0x1f);

					PM8001_IO_DBG(pm8001_ha,

						pm8001_printk(": CI=%d PI=%d "

						"msgHeader=%x\n",
@@ -1381,8 +1382,8 @@ static u32 mpi_msg_consume(struct pm8001_hba_info *pm8001_ha, 
				} else {

					circularQ->consumer_idx =

						(circularQ->consumer_idx +

						((msgHeader_tmp >> 24) & 0x1f))

						% 256;

						((le32_to_cpu(msgHeader_tmp)

						>> 24) & 0x1f)) % 256;

					msgHeader_tmp = 0;

					pm8001_write_32(msgHeader, 0, 0);

					/* update the CI of outbound queue */
@@ -1394,7 +1395,8 @@ static u32 mpi_msg_consume(struct pm8001_hba_info *pm8001_ha, 
			} else {

				circularQ->consumer_idx =

					(circularQ->consumer_idx +

					((msgHeader_tmp >> 24) & 0x1f)) % 256;

					((le32_to_cpu(msgHeader_tmp) >> 24) &

					0x1f)) % 256;

				msgHeader_tmp = 0;

				pm8001_write_32(msgHeader, 0, 0);

				/* update the CI of outbound queue */
@@ -1410,7 +1412,8 @@ static u32 mpi_msg_consume(struct pm8001_hba_info *pm8001_ha, 
			producer_index = pm8001_read_32(pi_virt);

			circularQ->producer_index = cpu_to_le32(producer_index);

		}

	} while (circularQ->producer_index != circularQ->consumer_idx);

	} while (le32_to_cpu(circularQ->producer_index) !=

		circularQ->consumer_idx);

	/* while we don't have any more not-yet-delivered message */

	/* report empty */

	return MPI_IO_STATUS_BUSY;
@@ -3060,7 +3063,7 @@ static void pm8001_hw_event_ack_req(struct pm8001_hba_info *pm8001_ha, 


	memset((u8 *)&payload, 0, sizeof(payload));

	circularQ = &pm8001_ha->inbnd_q_tbl[Qnum];

	payload.tag = 1;

	payload.tag = cpu_to_le32(1);

	payload.sea_phyid_portid = cpu_to_le32(((SEA & 0xFFFF) << 8) |

		((phyId & 0x0F) << 4) | (port_id & 0x0F));

	payload.param0 = cpu_to_le32(param0);
@@ -3132,9 +3135,9 @@ hw_event_sas_phy_up(struct pm8001_hba_info *pm8001_ha, void *piomb) 
	phy->phy_type |= PORT_TYPE_SAS;

	phy->identify.device_type = deviceType;

	phy->phy_attached = 1;

	if (phy->identify.device_type == SAS_END_DEV)

	if (phy->identify.device_type == SAS_END_DEVICE)

		phy->identify.target_port_protocols = SAS_PROTOCOL_SSP;

	else if (phy->identify.device_type != NO_DEVICE)

	else if (phy->identify.device_type != SAS_PHY_UNUSED)

		phy->identify.target_port_protocols = SAS_PROTOCOL_SMP;

	phy->sas_phy.oob_mode = SAS_OOB_MODE;

	sas_ha->notify_phy_event(&phy->sas_phy, PHYE_OOB_DONE);
@@ -3278,7 +3281,7 @@ static int mpi_reg_resp(struct pm8001_hba_info *pm8001_ha, void *piomb) 
		(struct dev_reg_resp *)(piomb + 4);



	htag = le32_to_cpu(registerRespPayload->tag);

	ccb = &pm8001_ha->ccb_info[registerRespPayload->tag];

	ccb = &pm8001_ha->ccb_info[htag];

	pm8001_dev = ccb->device;

	status = le32_to_cpu(registerRespPayload->status);

	device_id = le32_to_cpu(registerRespPayload->device_id);
@@ -3352,7 +3355,7 @@ mpi_fw_flash_update_resp(struct pm8001_hba_info *pm8001_ha, void *piomb) 
	struct fw_control_ex	fw_control_context;

	struct fw_flash_Update_resp *ppayload =

		(struct fw_flash_Update_resp *)(piomb + 4);

	u32 tag = le32_to_cpu(ppayload->tag);

	u32 tag = ppayload->tag;

	struct pm8001_ccb_info *ccb = &pm8001_ha->ccb_info[tag];

	status = le32_to_cpu(ppayload->status);

	memcpy(&fw_control_context,
@@ -3441,13 +3444,12 @@ mpi_task_abort_resp(struct pm8001_hba_info *pm8001_ha, void *piomb) 


	struct task_abort_resp *pPayload =

		(struct task_abort_resp *)(piomb + 4);

	ccb = &pm8001_ha->ccb_info[pPayload->tag];

	t = ccb->task;





	status = le32_to_cpu(pPayload->status);

	tag = le32_to_cpu(pPayload->tag);

	scp = le32_to_cpu(pPayload->scp);

	ccb = &pm8001_ha->ccb_info[tag];

	t = ccb->task;

	PM8001_IO_DBG(pm8001_ha,

		pm8001_printk(" status = 0x%x\n", status));

	if (t == NULL)
@@ -3473,7 +3475,7 @@ mpi_task_abort_resp(struct pm8001_hba_info *pm8001_ha, void *piomb) 
	t->task_state_flags &= ~SAS_TASK_AT_INITIATOR;

	t->task_state_flags |= SAS_TASK_STATE_DONE;

	spin_unlock_irqrestore(&t->task_state_lock, flags);

	pm8001_ccb_task_free(pm8001_ha, t, ccb, pPayload->tag);

	pm8001_ccb_task_free(pm8001_ha, t, ccb, tag);

	mb();

	t->task_done(t);

	return 0;
@@ -3700,7 +3702,7 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void* piomb) 
static void process_one_iomb(struct pm8001_hba_info *pm8001_ha, void *piomb)

{

	u32 pHeader = (u32)*(u32 *)piomb;

	u8 opc = (u8)((le32_to_cpu(pHeader)) & 0xFFF);

	u8 opc = (u8)(pHeader & 0xFFF);



	PM8001_MSG_DBG(pm8001_ha, pm8001_printk("process_one_iomb:"));
@@ -3867,7 +3869,7 @@ static int process_oq(struct pm8001_hba_info *pm8001_ha) 
{

	struct outbound_queue_table *circularQ;

	void *pMsg1 = NULL;

	u8 bc = 0;

	u8 uninitialized_var(bc);

	u32 ret = MPI_IO_STATUS_FAIL;

	unsigned long flags;
@@ -3882,11 +3884,10 @@ static int process_oq(struct pm8001_hba_info *pm8001_ha) 
			mpi_msg_free_set(pm8001_ha, pMsg1, circularQ, bc);

		}

		if (MPI_IO_STATUS_BUSY == ret) {

			u32 producer_idx;

			/* Update the producer index from SPC */

			producer_idx = pm8001_read_32(circularQ->pi_virt);

			circularQ->producer_index = cpu_to_le32(producer_idx);

			if (circularQ->producer_index ==

			circularQ->producer_index =

				cpu_to_le32(pm8001_read_32(circularQ->pi_virt));

			if (le32_to_cpu(circularQ->producer_index) ==

				circularQ->consumer_idx)

				/* OQ is empty */

				break;
@@ -3918,9 +3919,9 @@ pm8001_chip_make_sg(struct scatterlist *scatter, int nr, void *prd) 
	}

}



static void build_smp_cmd(u32 deviceID, u32 hTag, struct smp_req *psmp_cmd)

static void build_smp_cmd(u32 deviceID, __le32 hTag, struct smp_req *psmp_cmd)

{

	psmp_cmd->tag = cpu_to_le32(hTag);

	psmp_cmd->tag = hTag;

	psmp_cmd->device_id = cpu_to_le32(deviceID);

	psmp_cmd->len_ip_ir = cpu_to_le32(1|(1 << 1));

}
@@ -4004,7 +4005,7 @@ static int pm8001_chip_ssp_io_req(struct pm8001_hba_info *pm8001_ha, 
	struct ssp_ini_io_start_req ssp_cmd;

	u32 tag = ccb->ccb_tag;

	int ret;

	__le64 phys_addr;

	u64 phys_addr;

	struct inbound_queue_table *circularQ;

	u32 opc = OPC_INB_SSPINIIOSTART;

	memset(&ssp_cmd, 0, sizeof(ssp_cmd));
@@ -4025,15 +4026,15 @@ static int pm8001_chip_ssp_io_req(struct pm8001_hba_info *pm8001_ha, 
	/* fill in PRD (scatter/gather) table, if any */

	if (task->num_scatter > 1) {

		pm8001_chip_make_sg(task->scatter, ccb->n_elem, ccb->buf_prd);

		phys_addr = cpu_to_le64(ccb->ccb_dma_handle +

				offsetof(struct pm8001_ccb_info, buf_prd[0]));

		ssp_cmd.addr_low = lower_32_bits(phys_addr);

		ssp_cmd.addr_high = upper_32_bits(phys_addr);

		phys_addr = ccb->ccb_dma_handle +

				offsetof(struct pm8001_ccb_info, buf_prd[0]);

		ssp_cmd.addr_low = cpu_to_le32(lower_32_bits(phys_addr));

		ssp_cmd.addr_high = cpu_to_le32(upper_32_bits(phys_addr));

		ssp_cmd.esgl = cpu_to_le32(1<<31);

	} else if (task->num_scatter == 1) {

		__le64 dma_addr = cpu_to_le64(sg_dma_address(task->scatter));

		ssp_cmd.addr_low = lower_32_bits(dma_addr);

		ssp_cmd.addr_high = upper_32_bits(dma_addr);

		u64 dma_addr = sg_dma_address(task->scatter);

		ssp_cmd.addr_low = cpu_to_le32(lower_32_bits(dma_addr));

		ssp_cmd.addr_high = cpu_to_le32(upper_32_bits(dma_addr));

		ssp_cmd.len = cpu_to_le32(task->total_xfer_len);

		ssp_cmd.esgl = 0;

	} else if (task->num_scatter == 0) {
@@ -4056,7 +4057,7 @@ static int pm8001_chip_sata_req(struct pm8001_hba_info *pm8001_ha, 
	int ret;

	struct sata_start_req sata_cmd;

	u32 hdr_tag, ncg_tag = 0;

	__le64 phys_addr;

	u64 phys_addr;

	u32 ATAP = 0x0;

	u32 dir;

	struct inbound_queue_table *circularQ;
@@ -4095,13 +4096,13 @@ static int pm8001_chip_sata_req(struct pm8001_hba_info *pm8001_ha, 
	/* fill in PRD (scatter/gather) table, if any */

	if (task->num_scatter > 1) {

		pm8001_chip_make_sg(task->scatter, ccb->n_elem, ccb->buf_prd);

		phys_addr = cpu_to_le64(ccb->ccb_dma_handle +

				offsetof(struct pm8001_ccb_info, buf_prd[0]));

		phys_addr = ccb->ccb_dma_handle +

				offsetof(struct pm8001_ccb_info, buf_prd[0]);

		sata_cmd.addr_low = lower_32_bits(phys_addr);

		sata_cmd.addr_high = upper_32_bits(phys_addr);

		sata_cmd.esgl = cpu_to_le32(1 << 31);

	} else if (task->num_scatter == 1) {

		__le64 dma_addr = cpu_to_le64(sg_dma_address(task->scatter));

		u64 dma_addr = sg_dma_address(task->scatter);

		sata_cmd.addr_low = lower_32_bits(dma_addr);

		sata_cmd.addr_high = upper_32_bits(dma_addr);

		sata_cmd.len = cpu_to_le32(task->total_xfer_len);
@@ -4245,7 +4246,7 @@ static int pm8001_chip_dereg_dev_req(struct pm8001_hba_info *pm8001_ha, 


	circularQ = &pm8001_ha->inbnd_q_tbl[0];

	memset(&payload, 0, sizeof(payload));

	payload.tag = 1;

	payload.tag = cpu_to_le32(1);

	payload.device_id = cpu_to_le32(device_id);

	PM8001_MSG_DBG(pm8001_ha,

		pm8001_printk("unregister device device_id = %d\n", device_id));
@@ -4269,7 +4270,7 @@ static int pm8001_chip_phy_ctl_req(struct pm8001_hba_info *pm8001_ha, 
	u32 opc = OPC_INB_LOCAL_PHY_CONTROL;

	memset(&payload, 0, sizeof(payload));

	circularQ = &pm8001_ha->inbnd_q_tbl[0];

	payload.tag = 1;

	payload.tag = cpu_to_le32(1);

	payload.phyop_phyid =

		cpu_to_le32(((phy_op & 0xff) << 8) | (phyId & 0x0F));

	ret = mpi_build_cmd(pm8001_ha, circularQ, opc, &payload);
@@ -4563,8 +4564,10 @@ pm8001_chip_fw_flash_update_build(struct pm8001_hba_info *pm8001_ha, 
	payload.cur_image_offset = cpu_to_le32(info->cur_image_offset);

	payload.total_image_len = cpu_to_le32(info->total_image_len);

	payload.len = info->sgl.im_len.len ;

	payload.sgl_addr_lo = lower_32_bits(info->sgl.addr);

	payload.sgl_addr_hi = upper_32_bits(info->sgl.addr);

	payload.sgl_addr_lo =

		cpu_to_le32(lower_32_bits(le64_to_cpu(info->sgl.addr)));

	payload.sgl_addr_hi =

		cpu_to_le32(upper_32_bits(le64_to_cpu(info->sgl.addr)));

	ret = mpi_build_cmd(pm8001_ha, circularQ, opc, &payload);

	return ret;

}

drivers/scsi/pm8001/pm8001_hwi.h

+1 −1
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ struct set_nvm_data_req { 
	__le32	tag;

	__le32	len_ir_vpdd;

	__le32	vpd_offset;

	u32	reserved[8];

	__le32	reserved[8];

	__le32	resp_addr_lo;

	__le32	resp_addr_hi;

	__le32	resp_len;