74 lines
2.7 KiB
Diff
74 lines
2.7 KiB
Diff
From badecc38102204f5297ad6ce1d7c7875e514c6f7 Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Mon, 18 Feb 2019 08:34:25 +0100
|
|
Subject: [PATCH] scsi: hisi_sas: fix calls to dma_set_mask_and_coherent()
|
|
Origin: https://git.kernel.org/linus/d9a00459effc30f6de2cdd887b64f15c6c54ae71
|
|
|
|
The change to use dma_set_mask_and_coherent() incorrectly made a second
|
|
call with the 32 bit DMA mask value when the call with the 64 bit DMA
|
|
mask value succeeded.
|
|
|
|
[mkp: fixed commit message]
|
|
|
|
Fixes: e4db40e7a1a2 ("scsi: hisi_sas: use dma_set_mask_and_coherent")
|
|
Cc: <stable@vger.kernel.org>
|
|
Suggested-by: Ewan D. Milne <emilne@redhat.com>
|
|
Signed-off-by: Hannes Reinecke <hare@suse.com>
|
|
Reviewed-by: Christoph Hellwig <hch@lst.de>
|
|
Signed-off-by: Hannes Reinecke <hare@suse.com>
|
|
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
---
|
|
drivers/scsi/hisi_sas/hisi_sas_main.c | 8 ++++++--
|
|
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 8 +++++---
|
|
2 files changed, 11 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
|
|
index 3c03de9d18dd..8aeb92d9144e 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
|
|
@@ -2339,6 +2339,7 @@ static struct Scsi_Host *hisi_sas_shost_alloc(struct platform_device *pdev,
|
|
struct Scsi_Host *shost;
|
|
struct hisi_hba *hisi_hba;
|
|
struct device *dev = &pdev->dev;
|
|
+ int error;
|
|
|
|
shost = scsi_host_alloc(hw->sht, sizeof(*hisi_hba));
|
|
if (!shost) {
|
|
@@ -2359,8 +2360,11 @@ static struct Scsi_Host *hisi_sas_shost_alloc(struct platform_device *pdev,
|
|
if (hisi_sas_get_fw_info(hisi_hba) < 0)
|
|
goto err_out;
|
|
|
|
- if (dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64)) &&
|
|
- dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32))) {
|
|
+ error = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64));
|
|
+ if (error)
|
|
+ error = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
|
|
+
|
|
+ if (error) {
|
|
dev_err(dev, "No usable DMA addressing method\n");
|
|
goto err_out;
|
|
}
|
|
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
index 6d584f232204..434f017afadc 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
@@ -2328,10 +2328,12 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
|
if (rc)
|
|
goto err_out_disable_device;
|
|
|
|
- if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)) ||
|
|
- dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32))) {
|
|
+ rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
|
|
+ if (rc)
|
|
+ rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
|
|
+ if (rc) {
|
|
dev_err(dev, "No usable DMA addressing method\n");
|
|
- rc = -EIO;
|
|
+ rc = -ENODEV;
|
|
goto err_out_regions;
|
|
}
|
|
|
|
--
|
|
2.20.1
|
|
|