From: Ming Lei <ming.lei@redhat.com>
To: linux-scsi@vger.kernel.org,
"Martin K . Petersen" <martin.petersen@oracle.com>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>,
Bart Van Assche <bvanassche@acm.org>,
Hannes Reinecke <hare@suse.com>, Christoph Hellwig <hch@lst.de>,
Jim Gill <jgill@vmware.com>, Cathy Avery <cavery@redhat.com>,
"Ewan D . Milne" <emilne@redhat.com>,
Brian King <brking@us.ibm.com>,
James Smart <james.smart@broadcom.com>,
"Juergen E . Fischer" <fischer@norbit.de>,
Michael Schmitz <schmitzmic@gmail.com>,
Finn Thain <fthain@telegraphics.com.au>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
devel@driverdev.osuosl.org, linux-usb@vger.kernel.org,
Dan Carpenter <dan.carpenter@oracle.com>,
Benjamin Block <bblock@linux.ibm.com>,
Ming Lei <ming.lei@redhat.com>
Subject: [PATCH V3 04/15] scsi: mvumi: use sg helper to operate scatterlist
Date: Fri, 14 Jun 2019 10:53:05 +0800 [thread overview]
Message-ID: <20190614025316.7360-5-ming.lei@redhat.com> (raw)
In-Reply-To: <20190614025316.7360-1-ming.lei@redhat.com>
Use the scatterlist iterators and remove direct indexing of the
scatterlist array.
This way allows us to pre-allocate one small scatterlist, which can be
chained with one runtime allocated scatterlist if the pre-allocated one
isn't enough for the whole request.
Reviewed-by: Ewan D. Milne <emilne@redhat.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
drivers/scsi/mvumi.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/scsi/mvumi.c b/drivers/scsi/mvumi.c
index a5410615edac..0022cd31500a 100644
--- a/drivers/scsi/mvumi.c
+++ b/drivers/scsi/mvumi.c
@@ -211,8 +211,7 @@ static int mvumi_make_sgl(struct mvumi_hba *mhba, struct scsi_cmnd *scmd,
unsigned int sgnum = scsi_sg_count(scmd);
dma_addr_t busaddr;
- sg = scsi_sglist(scmd);
- *sg_count = dma_map_sg(&mhba->pdev->dev, sg, sgnum,
+ *sg_count = dma_map_sg(&mhba->pdev->dev, scsi_sglist(scmd), sgnum,
scmd->sc_data_direction);
if (*sg_count > mhba->max_sge) {
dev_err(&mhba->pdev->dev,
@@ -222,12 +221,12 @@ static int mvumi_make_sgl(struct mvumi_hba *mhba, struct scsi_cmnd *scmd,
scmd->sc_data_direction);
return -1;
}
- for (i = 0; i < *sg_count; i++) {
- busaddr = sg_dma_address(&sg[i]);
+ scsi_for_each_sg(scmd, sg, *sg_count, i) {
+ busaddr = sg_dma_address(sg);
m_sg->baseaddr_l = cpu_to_le32(lower_32_bits(busaddr));
m_sg->baseaddr_h = cpu_to_le32(upper_32_bits(busaddr));
m_sg->flags = 0;
- sgd_setsz(mhba, m_sg, cpu_to_le32(sg_dma_len(&sg[i])));
+ sgd_setsz(mhba, m_sg, cpu_to_le32(sg_dma_len(sg)));
if ((i + 1) == *sg_count)
m_sg->flags |= 1U << mhba->eot_flag;
--
2.20.1
next prev parent reply other threads:[~2019-06-14 2:53 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-14 2:53 [PATCH V3 00/15] use sg helper to operate scatterlist Ming Lei
2019-06-14 2:53 ` [PATCH V3 01/15] scsi: vmw_pscsi: " Ming Lei
2019-06-14 2:53 ` [PATCH V3 02/15] scsi: advansys: " Ming Lei
2019-06-14 2:53 ` [PATCH V3 03/15] scsi: lpfc: " Ming Lei
2019-06-14 2:53 ` Ming Lei [this message]
2019-06-14 2:53 ` [PATCH V3 05/15] scsi: ipr: " Ming Lei
2019-06-14 2:53 ` [PATCH V3 06/15] scsi: pmcraid: " Ming Lei
2019-06-14 2:53 ` [PATCH V3 07/15] usb: image: microtek: " Ming Lei
2019-06-14 5:39 ` Finn Thain
2019-06-14 6:57 ` Ming Lei
2019-06-14 2:53 ` [PATCH V3 08/15] staging: unisys: visorhba: " Ming Lei
2019-06-14 5:48 ` Greg Kroah-Hartman
2019-06-14 2:53 ` [PATCH V3 09/15] s390: zfcp_fc: " Ming Lei
2019-06-16 16:25 ` Benjamin Block
2019-06-14 2:53 ` [PATCH V3 10/15] scsi: aha152x: " Ming Lei
2019-06-14 5:27 ` Finn Thain
2019-06-14 8:17 ` Ming Lei
2019-06-14 10:36 ` Finn Thain
2019-06-17 1:14 ` Ming Lei
2019-06-14 2:53 ` [PATCH V3 11/15] scsi: imm: " Ming Lei
2019-06-14 2:53 ` [PATCH V3 12/15] scsi: pcmcia: nsp_cs: " Ming Lei
2019-06-14 2:53 ` [PATCH V3 13/15] scsi: ppa: " Ming Lei
2019-06-14 2:53 ` [PATCH V3 14/15] scsi: wd33c93: " Ming Lei
2019-06-14 2:53 ` [PATCH V3 15/15] NCR5380: Support chained sg lists Ming Lei
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190614025316.7360-5-ming.lei@redhat.com \
--to=ming.lei@redhat.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=bblock@linux.ibm.com \
--cc=brking@us.ibm.com \
--cc=bvanassche@acm.org \
--cc=cavery@redhat.com \
--cc=dan.carpenter@oracle.com \
--cc=devel@driverdev.osuosl.org \
--cc=emilne@redhat.com \
--cc=fischer@norbit.de \
--cc=fthain@telegraphics.com.au \
--cc=gregkh@linuxfoundation.org \
--cc=hare@suse.com \
--cc=hch@lst.de \
--cc=james.smart@broadcom.com \
--cc=jgill@vmware.com \
--cc=linux-scsi@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=schmitzmic@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).