aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi_lib.c
diff options
context:
space:
mode:
authorFUJITA Tomonori <tomof@acm.org>2008-02-05 01:28:05 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-05 12:44:11 -0500
commit860ac568e825b623b0b335ca277dd47d1d7fd5d0 (patch)
treeefdf476e1bbf564d62935f86c3467a4c4f4a7fc6 /drivers/scsi/scsi_lib.c
parentd1b5163206769aa93271bc1029e877ea9f920a5d (diff)
iommu sg merging: call blk_queue_segment_boundary in __scsi_alloc_queue
request_queue and device struct must have the same value of a segment size limit. This patch adds blk_queue_segment_boundary in __scsi_alloc_queue so LLDs don't need to call both blk_queue_segment_boundary and set_dma_max_seg_size. A LLD can change the default value (64KB) can call device_dma_parameters accessors like pci_set_dma_max_seg_size when allocating scsi_host. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Acked-by: Jeff Garzik <jeff@garzik.org> Cc: James Bottomley <James.Bottomley@steeleye.com> Acked-by: Jens Axboe <jens.axboe@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
-rw-r--r--drivers/scsi/scsi_lib.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index b12fb310e399..68e424f09acb 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1569,6 +1569,7 @@ struct request_queue *__scsi_alloc_queue(struct Scsi_Host *shost,
1569 request_fn_proc *request_fn) 1569 request_fn_proc *request_fn)
1570{ 1570{
1571 struct request_queue *q; 1571 struct request_queue *q;
1572 struct device *dev = shost->shost_gendev.parent;
1572 1573
1573 q = blk_init_queue(request_fn, NULL); 1574 q = blk_init_queue(request_fn, NULL);
1574 if (!q) 1575 if (!q)
@@ -1584,6 +1585,8 @@ struct request_queue *__scsi_alloc_queue(struct Scsi_Host *shost,
1584 blk_queue_bounce_limit(q, scsi_calculate_bounce_limit(shost)); 1585 blk_queue_bounce_limit(q, scsi_calculate_bounce_limit(shost));
1585 blk_queue_segment_boundary(q, shost->dma_boundary); 1586 blk_queue_segment_boundary(q, shost->dma_boundary);
1586 1587
1588 blk_queue_max_segment_size(q, dma_get_max_seg_size(dev));
1589
1587 if (!shost->use_clustering) 1590 if (!shost->use_clustering)
1588 clear_bit(QUEUE_FLAG_CLUSTER, &q->queue_flags); 1591 clear_bit(QUEUE_FLAG_CLUSTER, &q->queue_flags);
1589 1592