diff options
| author | Christoph Hellwig | 2019-01-16 17:12:15 +0100 |
|---|---|---|
| committer | Martin K. Petersen | 2019-01-23 02:40:59 +0100 |
| commit | a8cf59a6692c9c55a5a10257de97919fae6edef8 (patch) | |
| tree | 053ce64df252111bc86cf10f34c22ab042f082ca /drivers/scsi/aacraid/linit.c | |
| parent | scsi: cxgb4i: add wait_for_completion() (diff) | |
| download | kernel-qcow2-linux-a8cf59a6692c9c55a5a10257de97919fae6edef8.tar.gz kernel-qcow2-linux-a8cf59a6692c9c55a5a10257de97919fae6edef8.tar.xz kernel-qcow2-linux-a8cf59a6692c9c55a5a10257de97919fae6edef8.zip | |
scsi: communicate max segment size to the DMA mapping code
When a host driver sets a maximum segment size we should not only propagate
that setting to the block layer, which can merge segments, but also to the
DMA mapping layer which can merge segments as well.
Fixes: 50c2e9107f ("scsi: introduce a max_segment_size host_template parameters")
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/aacraid/linit.c')
| -rw-r--r-- | drivers/scsi/aacraid/linit.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c index 634ddb90e7aa..7e56a11836c1 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c @@ -1747,11 +1747,10 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) shost->max_sectors = (shost->sg_tablesize * 8) + 112; } - error = dma_set_max_seg_size(&pdev->dev, - (aac->adapter_info.options & AAC_OPT_NEW_COMM) ? - (shost->max_sectors << 9) : 65536); - if (error) - goto out_deinit; + if (aac->adapter_info.options & AAC_OPT_NEW_COMM) + shost->max_segment_size = shost->max_sectors << 9; + else + shost->max_segment_size = 65536; /* * Firmware printf works only with older firmware. |