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

Commit d7dea2cf authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by James Bottomley
Browse files

[SCSI] sbp2: convert to use the data buffer accessors 



- remove the unnecessary map_single path.

- convert to use the new accessors for the sg lists and the
parameters.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 6cad75a6

drivers/ieee1394/sbp2.c

+4 −71
Original line number Diff line number Diff line
@@ -1488,69 +1488,6 @@ static void sbp2_prep_command_orb_sg(struct sbp2_command_orb *orb, 
	}

}



static void sbp2_prep_command_orb_no_sg(struct sbp2_command_orb *orb,

					struct sbp2_fwhost_info *hi,

					struct sbp2_command_info *cmd,

					struct scatterlist *sgpnt,

					u32 orb_direction,

					unsigned int scsi_request_bufflen,

					void *scsi_request_buffer,

					enum dma_data_direction dma_dir)

{

	cmd->dma_dir = dma_dir;

	cmd->dma_size = scsi_request_bufflen;

	cmd->dma_type = CMD_DMA_SINGLE;

	cmd->cmd_dma = dma_map_single(hi->host->device.parent,

				      scsi_request_buffer,

				      cmd->dma_size, cmd->dma_dir);

	orb->data_descriptor_hi = ORB_SET_NODE_ID(hi->host->node_id);

	orb->misc |= ORB_SET_DIRECTION(orb_direction);



	/* handle case where we get a command w/o s/g enabled

	 * (but check for transfers larger than 64K) */

	if (scsi_request_bufflen <= SBP2_MAX_SG_ELEMENT_LENGTH) {



		orb->data_descriptor_lo = cmd->cmd_dma;

		orb->misc |= ORB_SET_DATA_SIZE(scsi_request_bufflen);



	} else {

		/* The buffer is too large. Turn this into page tables. */



		struct sbp2_unrestricted_page_table *sg_element =

						&cmd->scatter_gather_element[0];

		u32 sg_count, sg_len;

		dma_addr_t sg_addr;



		orb->data_descriptor_lo = cmd->sge_dma;

		orb->misc |= ORB_SET_PAGE_TABLE_PRESENT(0x1);



		/* fill out our SBP-2 page tables; split up the large buffer */

		sg_count = 0;

		sg_len = scsi_request_bufflen;

		sg_addr = cmd->cmd_dma;

		while (sg_len) {

			sg_element[sg_count].segment_base_lo = sg_addr;

			if (sg_len > SBP2_MAX_SG_ELEMENT_LENGTH) {

				sg_element[sg_count].length_segment_base_hi =

					PAGE_TABLE_SET_SEGMENT_LENGTH(SBP2_MAX_SG_ELEMENT_LENGTH);

				sg_addr += SBP2_MAX_SG_ELEMENT_LENGTH;

				sg_len -= SBP2_MAX_SG_ELEMENT_LENGTH;

			} else {

				sg_element[sg_count].length_segment_base_hi =

					PAGE_TABLE_SET_SEGMENT_LENGTH(sg_len);

				sg_len = 0;

			}

			sg_count++;

		}



		orb->misc |= ORB_SET_DATA_SIZE(sg_count);



		sbp2util_cpu_to_be32_buffer(sg_element,

				(sizeof(struct sbp2_unrestricted_page_table)) *

				sg_count);

	}

}



static void sbp2_create_command_orb(struct sbp2_lu *lu,

				    struct sbp2_command_info *cmd,

				    unchar *scsi_cmd,
@@ -1594,13 +1531,9 @@ static void sbp2_create_command_orb(struct sbp2_lu *lu, 
		orb->data_descriptor_hi = 0x0;

		orb->data_descriptor_lo = 0x0;

		orb->misc |= ORB_SET_DIRECTION(1);

	} else if (scsi_use_sg)

	} else

		sbp2_prep_command_orb_sg(orb, hi, cmd, scsi_use_sg, sgpnt,

					 orb_direction, dma_dir);

	else

		sbp2_prep_command_orb_no_sg(orb, hi, cmd, sgpnt, orb_direction,

					    scsi_request_bufflen,

					    scsi_request_buffer, dma_dir);



	sbp2util_cpu_to_be32_buffer(orb, sizeof(*orb));
@@ -1689,15 +1622,15 @@ static int sbp2_send_command(struct sbp2_lu *lu, struct scsi_cmnd *SCpnt, 
			     void (*done)(struct scsi_cmnd *))

{

	unchar *scsi_cmd = (unchar *)SCpnt->cmnd;

	unsigned int request_bufflen = SCpnt->request_bufflen;

	unsigned int request_bufflen = scsi_bufflen(SCpnt);

	struct sbp2_command_info *cmd;



	cmd = sbp2util_allocate_command_orb(lu, SCpnt, done);

	if (!cmd)

		return -EIO;



	sbp2_create_command_orb(lu, cmd, scsi_cmd, SCpnt->use_sg,

				request_bufflen, SCpnt->request_buffer,

	sbp2_create_command_orb(lu, cmd, scsi_cmd, scsi_sg_count(SCpnt),

				request_bufflen, scsi_sglist(SCpnt),

				SCpnt->sc_data_direction);

	sbp2_link_orb_command(lu, cmd);