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

Commit 0c95fdc5 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Linus Torvalds
Browse files

iommu sg merging: aacraid: use pci_set_dma_max_seg_size 



This sets the segment size limit properly via pci_set_dma_max_seg_size
and remove blk_queue_max_segment_size because scsi-ml calls it.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Acked-by: default avatarJens Axboe <jens.axboe@oracle.com>
Acked-by: default avatar"Salyzyn, Mark" <mark_salyzyn@adaptec.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b7d8629f

drivers/scsi/aacraid/linit.c

+6 −3
Original line number Diff line number Diff line
@@ -449,9 +449,6 @@ static int aac_slave_configure(struct scsi_device *sdev) 
		else if (depth < 2)

			depth = 2;

		scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, depth);

		if (!(((struct aac_dev *)host->hostdata)->adapter_info.options &

				AAC_OPT_NEW_COMM))

			blk_queue_max_segment_size(sdev->request_queue, 65536);

	} else

		scsi_adjust_queue_depth(sdev, 0, 1);
@@ -1133,6 +1130,12 @@ static int __devinit aac_probe_one(struct pci_dev *pdev, 
	if (error < 0)

		goto out_deinit;



	if (!(aac->adapter_info.options & AAC_OPT_NEW_COMM)) {

		error = pci_set_dma_max_seg_size(pdev, 65536);

		if (error)

			goto out_deinit;

	}



	/*

 	 * Lets override negotiations and drop the maximum SG limit to 34

 	 */