From: Jens Axboe <jens.axboe@oracle.com>
To: linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org
Cc: Jens Axboe <jens.axboe@oracle.com>, hch@infradead.org
Subject: [PATCH 21/33] qla1280: sg chaining support
Date: Mon, 16 Jul 2007 11:47:35 +0200 [thread overview]
Message-ID: <11845792683713-git-send-email-jens.axboe@oracle.com> (raw)
In-Reply-To: <11845792671245-git-send-email-jens.axboe@oracle.com>
Interesting hardware setup...
Cc: hch@infradead.org
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---
drivers/scsi/qla1280.c | 66 +++++++++++++++++++++++++++---------------------
1 files changed, 37 insertions(+), 29 deletions(-)
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 54d8bdf..bd805ec 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -2775,7 +2775,7 @@ qla1280_64bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
struct device_reg __iomem *reg = ha->iobase;
struct scsi_cmnd *cmd = sp->cmd;
cmd_a64_entry_t *pkt;
- struct scatterlist *sg = NULL;
+ struct scatterlist *sg = NULL, *s;
__le32 *dword_ptr;
dma_addr_t dma_handle;
int status = 0;
@@ -2889,13 +2889,16 @@ qla1280_64bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
* Load data segments.
*/
if (seg_cnt) { /* If data transfer. */
+ int remseg = seg_cnt;
/* Setup packet address segment pointer. */
dword_ptr = (u32 *)&pkt->dseg_0_address;
if (cmd->use_sg) { /* If scatter gather */
/* Load command entry data segments. */
- for (cnt = 0; cnt < 2 && seg_cnt; cnt++, seg_cnt--) {
- dma_handle = sg_dma_address(sg);
+ for_each_sg(sg, s, seg_cnt, cnt) {
+ if (cnt == 2)
+ break;
+ dma_handle = sg_dma_address(s);
#if defined(CONFIG_IA64_GENERIC) || defined(CONFIG_IA64_SGI_SN2)
if (ha->flags.use_pci_vchannel)
sn_pci_set_vchan(ha->pdev,
@@ -2906,12 +2909,12 @@ qla1280_64bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
cpu_to_le32(pci_dma_lo32(dma_handle));
*dword_ptr++ =
cpu_to_le32(pci_dma_hi32(dma_handle));
- *dword_ptr++ = cpu_to_le32(sg_dma_len(sg));
- sg++;
+ *dword_ptr++ = cpu_to_le32(sg_dma_len(s));
dprintk(3, "S/G Segment phys_addr=%x %x, len=0x%x\n",
cpu_to_le32(pci_dma_hi32(dma_handle)),
cpu_to_le32(pci_dma_lo32(dma_handle)),
- cpu_to_le32(sg_dma_len(sg)));
+ cpu_to_le32(sg_dma_len(sg_next(s))));
+ remseg--;
}
dprintk(5, "qla1280_64bit_start_scsi: Scatter/gather "
"command packet data - b %i, t %i, l %i \n",
@@ -2926,7 +2929,9 @@ qla1280_64bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
dprintk(3, "S/G Building Continuation...seg_cnt=0x%x "
"remains\n", seg_cnt);
- while (seg_cnt > 0) {
+ while (remseg > 0) {
+ /* Update sg start */
+ sg = s;
/* Adjust ring index. */
ha->req_ring_index++;
if (ha->req_ring_index == REQUEST_ENTRY_CNT) {
@@ -2952,9 +2957,10 @@ qla1280_64bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
(u32 *)&((struct cont_a64_entry *) pkt)->dseg_0_address;
/* Load continuation entry data segments. */
- for (cnt = 0; cnt < 5 && seg_cnt;
- cnt++, seg_cnt--) {
- dma_handle = sg_dma_address(sg);
+ for_each_sg(sg, s, remseg, cnt) {
+ if (cnt == 5)
+ break;
+ dma_handle = sg_dma_address(s);
#if defined(CONFIG_IA64_GENERIC) || defined(CONFIG_IA64_SGI_SN2)
if (ha->flags.use_pci_vchannel)
sn_pci_set_vchan(ha->pdev,
@@ -2966,12 +2972,12 @@ qla1280_64bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
*dword_ptr++ =
cpu_to_le32(pci_dma_hi32(dma_handle));
*dword_ptr++ =
- cpu_to_le32(sg_dma_len(sg));
+ cpu_to_le32(sg_dma_len(s));
dprintk(3, "S/G Segment Cont. phys_addr=%x %x, len=0x%x\n",
cpu_to_le32(pci_dma_hi32(dma_handle)),
cpu_to_le32(pci_dma_lo32(dma_handle)),
- cpu_to_le32(sg_dma_len(sg)));
- sg++;
+ cpu_to_le32(sg_dma_len(s)));
+ remseg--;
}
dprintk(5, "qla1280_64bit_start_scsi: "
"continuation packet data - b %i, t "
@@ -3062,7 +3068,7 @@ qla1280_32bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
struct device_reg __iomem *reg = ha->iobase;
struct scsi_cmnd *cmd = sp->cmd;
struct cmd_entry *pkt;
- struct scatterlist *sg = NULL;
+ struct scatterlist *sg = NULL, *s;
__le32 *dword_ptr;
int status = 0;
int cnt;
@@ -3188,6 +3194,7 @@ qla1280_32bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
* Load data segments.
*/
if (seg_cnt) {
+ int remseg = seg_cnt;
/* Setup packet address segment pointer. */
dword_ptr = &pkt->dseg_0_address;
@@ -3196,22 +3203,25 @@ qla1280_32bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
qla1280_dump_buffer(1, (char *)sg, 4 * 16);
/* Load command entry data segments. */
- for (cnt = 0; cnt < 4 && seg_cnt; cnt++, seg_cnt--) {
+ for_each_sg(sg, s, seg_cnt, cnt) {
+ if (cnt == 4)
+ break;
*dword_ptr++ =
- cpu_to_le32(pci_dma_lo32(sg_dma_address(sg)));
- *dword_ptr++ =
- cpu_to_le32(sg_dma_len(sg));
+ cpu_to_le32(pci_dma_lo32(sg_dma_address(s)));
+ *dword_ptr++ = cpu_to_le32(sg_dma_len(s));
dprintk(3, "S/G Segment phys_addr=0x%lx, len=0x%x\n",
- (pci_dma_lo32(sg_dma_address(sg))),
- (sg_dma_len(sg)));
- sg++;
+ (pci_dma_lo32(sg_dma_address(s))),
+ (sg_dma_len(s)));
+ remseg--;
}
/*
* Build continuation packets.
*/
dprintk(3, "S/G Building Continuation"
"...seg_cnt=0x%x remains\n", seg_cnt);
- while (seg_cnt > 0) {
+ while (remseg > 0) {
+ /* Continue from end point */
+ sg = s;
/* Adjust ring index. */
ha->req_ring_index++;
if (ha->req_ring_index == REQUEST_ENTRY_CNT) {
@@ -3239,18 +3249,16 @@ qla1280_32bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
&((struct cont_entry *) pkt)->dseg_0_address;
/* Load continuation entry data segments. */
- for (cnt = 0; cnt < 7 && seg_cnt;
- cnt++, seg_cnt--) {
+ for_each_sg(sg, s, remseg, cnt) {
*dword_ptr++ =
- cpu_to_le32(pci_dma_lo32(sg_dma_address(sg)));
+ cpu_to_le32(pci_dma_lo32(sg_dma_address(s)));
*dword_ptr++ =
- cpu_to_le32(sg_dma_len(sg));
+ cpu_to_le32(sg_dma_len(s));
dprintk(1,
"S/G Segment Cont. phys_addr=0x%x, "
"len=0x%x\n",
- cpu_to_le32(pci_dma_lo32(sg_dma_address(sg))),
- cpu_to_le32(sg_dma_len(sg)));
- sg++;
+ cpu_to_le32(pci_dma_lo32(sg_dma_address(s))),
+ cpu_to_le32(sg_dma_len(s)));
}
dprintk(5, "qla1280_32bit_start_scsi: "
"continuation packet data - "
--
1.5.3.rc0.90.gbaa79
next prev parent reply other threads:[~2007-07-16 9:55 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-16 9:47 [PATCH 00/33] SG table " Jens Axboe
2007-07-16 9:47 ` [PATCH 01/33] crypto: don't pollute the global namespace with sg_next() Jens Axboe
2007-07-16 9:47 ` [PATCH 02/33] Add sg helpers for iterating over a scatterlist table Jens Axboe
2007-07-16 9:47 ` [PATCH 03/33] block: convert to using sg helpers Jens Axboe
2007-07-16 19:21 ` Bartlomiej Zolnierkiewicz
2007-07-16 19:14 ` Jens Axboe
2007-07-16 9:47 ` [PATCH 04/33] scsi: " Jens Axboe
2007-07-16 9:47 ` [PATCH 05/33] Add chained sg support to linux/scatterlist.h Jens Axboe
2007-07-16 19:21 ` Bartlomiej Zolnierkiewicz
2007-07-16 19:15 ` Jens Axboe
2007-07-16 9:47 ` [PATCH 06/33] i386 dma_map_sg: convert to using sg helpers Jens Axboe
2007-07-16 9:47 ` [PATCH 07/33] i386: enable sg chaining Jens Axboe
2007-07-16 9:47 ` [PATCH 08/33] swiotlb: sg chaining support Jens Axboe
2007-07-16 9:47 ` [PATCH 09/33] x86-64: update iommu/dma mapping functions to sg helpers Jens Axboe
2007-07-16 20:06 ` Andrew Morton
2007-07-16 20:10 ` Jens Axboe
2007-07-16 20:34 ` Andrew Morton
2007-07-16 22:08 ` Muli Ben-Yehuda
2007-07-17 7:38 ` Jens Axboe
2007-07-17 8:49 ` Muli Ben-Yehuda
2007-07-17 8:51 ` Jens Axboe
2007-07-17 9:00 ` Muli Ben-Yehuda
2007-07-17 7:02 ` Jens Axboe
2007-07-17 7:56 ` Jens Axboe
2007-07-17 11:03 ` Muli Ben-Yehuda
2007-07-17 11:05 ` Jens Axboe
2007-07-17 11:10 ` Muli Ben-Yehuda
2007-07-16 9:47 ` [PATCH 10/33] x86-64: enable sg chaining Jens Axboe
2007-07-16 9:47 ` [PATCH 11/33] IA64: sg chaining support Jens Axboe
2007-07-16 9:47 ` [PATCH 12/33] PPC: " Jens Axboe
2007-07-16 9:47 ` [PATCH 13/33] SPARC: " Jens Axboe
2007-07-16 11:29 ` David Miller
2007-07-16 9:47 ` [PATCH 14/33] SPARC64: " Jens Axboe
2007-07-16 11:29 ` David Miller
2007-07-16 9:47 ` [PATCH 15/33] scsi: simplify scsi_free_sgtable() Jens Axboe
2007-07-16 9:47 ` [PATCH 16/33] SCSI: support for allocating large scatterlists Jens Axboe
2007-07-16 9:47 ` [PATCH 17/33] ll_rw_blk: temporarily enable max_segments tweaking Jens Axboe
2007-07-16 9:47 ` [PATCH 18/33] libata: convert to using sg helpers Jens Axboe
2007-07-16 9:47 ` [PATCH 19/33] scsi_debug: support sg chaining Jens Axboe
2007-07-16 9:47 ` [PATCH 20/33] scsi generic: sg chaining support Jens Axboe
2007-07-16 9:47 ` Jens Axboe [this message]
2007-07-16 9:47 ` [PATCH 22/33] aic94xx: " Jens Axboe
2007-07-16 9:47 ` [PATCH 23/33] qlogicpti: " Jens Axboe
2007-07-16 9:47 ` [PATCH 24/33] ide-scsi: " Jens Axboe
2007-07-18 21:03 ` Bartlomiej Zolnierkiewicz
2007-07-16 9:47 ` [PATCH 25/33] gdth: " Jens Axboe
2007-07-16 9:47 ` [PATCH 26/33] aha1542: convert to use the data buffer accessors Jens Axboe
2007-07-16 9:47 ` [PATCH 27/33] advansys: " Jens Axboe
2007-07-16 9:47 ` [PATCH 28/33] ia64 simscsi: convert to use " Jens Axboe
2007-07-16 9:47 ` [PATCH 29/33] infiniband: sg chaining support Jens Axboe
2007-07-16 13:21 ` FUJITA Tomonori
2007-07-16 13:26 ` Jens Axboe
2007-07-16 9:47 ` [PATCH 30/33] USB storage: " Jens Axboe
2007-07-17 6:12 ` Greg KH
2007-07-17 7:01 ` Jens Axboe
2007-07-17 7:05 ` Greg KH
2007-07-17 7:07 ` Jens Axboe
2007-07-16 9:47 ` [PATCH 31/33] Fusion: " Jens Axboe
2007-07-16 13:20 ` FUJITA Tomonori
2007-07-16 13:25 ` Jens Axboe
2007-07-16 9:47 ` [PATCH 32/33] i2o: " Jens Axboe
2007-07-16 9:47 ` [PATCH 33/33] IDE: " Jens Axboe
2007-07-18 20:56 ` Bartlomiej Zolnierkiewicz
2007-07-19 6:19 ` Jens Axboe
2007-07-16 13:19 ` [PATCH 00/33] SG table " FUJITA Tomonori
2007-07-16 13:23 ` Jens Axboe
2007-07-16 13:19 ` FUJITA Tomonori
2007-07-16 13:24 ` Jens Axboe
2007-07-16 14:05 ` John Stoffel
2007-07-16 14:23 ` Martin K. Petersen
2007-07-16 14:43 ` Jens Axboe
2007-07-16 16:02 ` Kai Makisara
2007-07-16 16:43 ` Jens Axboe
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=11845792683713-git-send-email-jens.axboe@oracle.com \
--to=jens.axboe@oracle.com \
--cc=hch@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
/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
all inboxes | Powered by JetHome®