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

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

iommu sg merging: sata_inic162x: 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>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 860ac568

drivers/ata/sata_inic162x.c

+13 −12
Original line number Diff line number Diff line
@@ -108,17 +108,6 @@ struct inic_port_priv { 
	u8	cached_pirq_mask;

};



static int inic_slave_config(struct scsi_device *sdev)

{

	/* This controller is braindamaged.  dma_boundary is 0xffff

	 * like others but it will lock up the whole machine HARD if

	 * 65536 byte PRD entry is fed.  Reduce maximum segment size.

	 */

	blk_queue_max_segment_size(sdev->request_queue, 65536 - 512);



	return ata_scsi_slave_config(sdev);

}



static struct scsi_host_template inic_sht = {

	.module			= THIS_MODULE,

	.name			= DRV_NAME,
@@ -132,7 +121,7 @@ static struct scsi_host_template inic_sht = { 
	.use_clustering		= ATA_SHT_USE_CLUSTERING,

	.proc_name		= DRV_NAME,

	.dma_boundary		= ATA_DMA_BOUNDARY,

	.slave_configure	= inic_slave_config,

	.slave_configure	= ata_scsi_slave_config,

	.slave_destroy		= ata_scsi_slave_destroy,

	.bios_param		= ata_std_bios_param,

};
@@ -730,6 +719,18 @@ static int inic_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
		return rc;

	}



	/*

	 * This controller is braindamaged.  dma_boundary is 0xffff

	 * like others but it will lock up the whole machine HARD if

	 * 65536 byte PRD entry is fed. Reduce maximum segment size.

	 */

	rc = pci_set_dma_max_seg_size(pdev, 65536 - 512);

	if (rc) {

		dev_printk(KERN_ERR, &pdev->dev,

			   "failed to set the maximum segment size.\n");

		return rc;

	}



	rc = init_controller(iomap[MMIO_BAR], hpriv->cached_hctl);

	if (rc) {

		dev_printk(KERN_ERR, &pdev->dev,