44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
From 59bc5f2f2492ef9949cd723fc98bafa7d8a6c287 Mon Sep 17 00:00:00 2001
|
|
From: Christoph Hellwig <hch@lst.de>
|
|
Date: Thu, 18 Oct 2018 15:10:17 +0200
|
|
Subject: [PATCH 09/31] scsi: hisi_sas: use dma_set_mask_and_coherent
|
|
Origin: https://git.kernel.org/linus/e4db40e7a1a2cd6af3b6d5f8f3fba15533872398
|
|
|
|
The driver currently uses pci_set_dma_mask despite otherwise using the
|
|
generic DMA API. Switch it over to the better generic DMA API.
|
|
|
|
Signed-off-by: Christoph Hellwig <hch@lst.de>
|
|
Acked-by: John Garry <john.garry@huawei.com>
|
|
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
---
|
|
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 13 +++++--------
|
|
1 file changed, 5 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
index c3e0be90e19f..43005d39abe6 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
@@ -2199,14 +2199,11 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
|
if (rc)
|
|
goto err_out_disable_device;
|
|
|
|
- if ((pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) != 0) ||
|
|
- (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)) != 0)) {
|
|
- if ((pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) != 0) ||
|
|
- (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)) != 0)) {
|
|
- dev_err(dev, "No usable DMA addressing method\n");
|
|
- rc = -EIO;
|
|
- goto err_out_regions;
|
|
- }
|
|
+ if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)) ||
|
|
+ dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32))) {
|
|
+ dev_err(dev, "No usable DMA addressing method\n");
|
|
+ rc = -EIO;
|
|
+ goto err_out_regions;
|
|
}
|
|
|
|
shost = hisi_sas_shost_alloc_pci(pdev);
|
|
--
|
|
2.20.1
|
|
|