Commit 99c84dbdc73d158a1ab955a4a5f74c18074796a3

Authored by FUJITA Tomonori
Committed by Linus Torvalds
1 parent 681cc5cd3e

iommu sg merging: call dma_set_seg_boundary in __scsi_alloc_queue()

This is a one-line patch to add the following to __scsi_alloc_queue():

dma_set_seg_boundary(dev, shost->dma_boundary);

This is the simplest approach but the result looks odd,
__scsi_alloc_queue() does:

blk_queue_segment_boundary(q, shost->dma_boundary);
dma_set_seg_boundary(dev, shost->dma_boundary);
blk_queue_max_segment_size(q, dma_get_max_seg_size(dev));

I think that it would be better to set up segment boundary in the same
way as we did for the maximum segment size. That is, removing
shost->dma_boundary and LLDs call pci_set_dma_seg_boundary (or its
friends).

Then __scsi_alloc_queue() can set up both limits in the same way:

blk_queue_segment_boundary(q, dma_get_seg_boundary(dev));
blk_queue_max_segment_size(q, dma_get_max_seg_size(dev));

killing dma_boundary in scsi_host_template needs a large patch for
libata (dma_boundary is used by only libata and sym53c8xx). I'll send
a patch to do that if it is acceptable. James and Jeff?

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Greg KH <greg@kroah.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 1 additions and 0 deletions Side-by-side Diff

drivers/scsi/scsi_lib.c
... ... @@ -1584,6 +1584,7 @@
1584 1584 blk_queue_max_sectors(q, shost->max_sectors);
1585 1585 blk_queue_bounce_limit(q, scsi_calculate_bounce_limit(shost));
1586 1586 blk_queue_segment_boundary(q, shost->dma_boundary);
  1587 + dma_set_seg_boundary(dev, shost->dma_boundary);
1587 1588  
1588 1589 blk_queue_max_segment_size(q, dma_get_max_seg_size(dev));
1589 1590