aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata
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
commitb7d8629f8b4b250fda578e59ecddc77c6bdec2b6 (patch)
tree9164030272e3a4e67b8d31a0f596d99f814b66b6 /drivers/ata
parent860ac568e825b623b0b335ca277dd47d1d7fd5d0 (diff)
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: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Cc: 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/ata')
-rw-r--r--drivers/ata/sata_inic162x.c25
1 files changed, 13 insertions, 12 deletions
diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c
index 96e614a1c169..59e65edc5820 100644
--- a/drivers/ata/sata_inic162x.c
+++ b/drivers/ata/sata_inic162x.c
@@ -108,17 +108,6 @@ struct inic_port_priv {
108 u8 cached_pirq_mask; 108 u8 cached_pirq_mask;
109}; 109};
110 110
111static int inic_slave_config(struct scsi_device *sdev)
112{
113 /* This controller is braindamaged. dma_boundary is 0xffff
114 * like others but it will lock up the whole machine HARD if
115 * 65536 byte PRD entry is fed. Reduce maximum segment size.
116 */
117 blk_queue_max_segment_size(sdev->request_queue, 65536 - 512);
118
119 return ata_scsi_slave_config(sdev);
120}
121
122static struct scsi_host_template inic_sht = { 111static struct scsi_host_template inic_sht = {
123 .module = THIS_MODULE, 112 .module = THIS_MODULE,
124 .name = DRV_NAME, 113 .name = DRV_NAME,
@@ -132,7 +121,7 @@ static struct scsi_host_template inic_sht = {
132 .use_clustering = ATA_SHT_USE_CLUSTERING, 121 .use_clustering = ATA_SHT_USE_CLUSTERING,
133 .proc_name = DRV_NAME, 122 .proc_name = DRV_NAME,
134 .dma_boundary = ATA_DMA_BOUNDARY, 123 .dma_boundary = ATA_DMA_BOUNDARY,
135 .slave_configure = inic_slave_config, 124 .slave_configure = ata_scsi_slave_config,
136 .slave_destroy = ata_scsi_slave_destroy, 125 .slave_destroy = ata_scsi_slave_destroy,
137 .bios_param = ata_std_bios_param, 126 .bios_param = ata_std_bios_param,
138}; 127};
@@ -730,6 +719,18 @@ static int inic_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
730 return rc; 719 return rc;
731 } 720 }
732 721
722 /*
723 * This controller is braindamaged. dma_boundary is 0xffff
724 * like others but it will lock up the whole machine HARD if
725 * 65536 byte PRD entry is fed. Reduce maximum segment size.
726 */
727 rc = pci_set_dma_max_seg_size(pdev, 65536 - 512);
728 if (rc) {
729 dev_printk(KERN_ERR, &pdev->dev,
730 "failed to set the maximum segment size.\n");
731 return rc;
732 }
733
733 rc = init_controller(iomap[MMIO_BAR], hpriv->cached_hctl); 734 rc = init_controller(iomap[MMIO_BAR], hpriv->cached_hctl);
734 if (rc) { 735 if (rc) {
735 dev_printk(KERN_ERR, &pdev->dev, 736 dev_printk(KERN_ERR, &pdev->dev,