scsi: hptiop: fix calls to dma_set_mask() [Linux 5.0]

This Linux kernel change "scsi: hptiop: fix calls to dma_set_mask()" is included in the Linux 5.0 release. This change is authored by Hannes Reinecke <hare [at] suse.de> on Mon Feb 18 08:34:26 2019 +0100. The commit for this change in Linux stable tree is 3e344b6 (patch).

scsi: hptiop: fix calls to dma_set_mask()

The change to use dma_set_mask() incorrectly made a second call with the 32
bit DMA mask value when the call with the 64 bit DMA mask value succeeded.

Fixes: 453cd3700ca3 ("scsi: hptiop: use dma_set_mask")
Cc: <[email protected]>
Suggested-by: Ewan D. Milne <[email protected]>
Signed-off-by: Hannes Reinecke <[email protected]>
Reviewed-by: Christoph Hellwig <[email protected]>
Reviewed-by: Ewan D. Milne <[email protected]>
Signed-off-by: Martin K. Petersen <[email protected]>

There are 10 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/scsi/hptiop.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/hptiop.c b/drivers/scsi/hptiop.c
index 3eedfd4..251c084 100644
--- a/drivers/scsi/hptiop.c
+++ b/drivers/scsi/hptiop.c
@@ -1292,6 +1292,7 @@ static int hptiop_probe(struct pci_dev *pcidev, const struct pci_device_id *id)
    dma_addr_t start_phy;
    void *start_virt;
    u32 offset, i, req_size;
+   int rc;

    dprintk("hptiop_probe(%p)\n", pcidev);

@@ -1308,9 +1309,12 @@ static int hptiop_probe(struct pci_dev *pcidev, const struct pci_device_id *id)

    /* Enable 64bit DMA if possible */
    iop_ops = (struct hptiop_adapter_ops *)id->driver_data;
-   if (dma_set_mask(&pcidev->dev,
-            DMA_BIT_MASK(iop_ops->hw_dma_bit_mask)) ||
-       dma_set_mask(&pcidev->dev, DMA_BIT_MASK(32))) {
+   rc = dma_set_mask(&pcidev->dev,
+             DMA_BIT_MASK(iop_ops->hw_dma_bit_mask));
+   if (rc)
+       rc = dma_set_mask(&pcidev->dev, DMA_BIT_MASK(32));
+
+   if (rc) {
        printk(KERN_ERR "hptiop: fail to set dma_mask\n");
        goto disable_pci_device;
    }

Leave a Reply

Your email address will not be published. Required fields are marked *