scsi: bfa: fix calls to dma_set_mask_and_coherent() [Linux 5.0]

This Linux kernel change "scsi: bfa: fix calls to dma_set_mask_and_coherent()" 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:23 2019 +0100. The commit for this change in Linux stable tree is 11ea382 (patch).

scsi: bfa: fix calls to dma_set_mask_and_coherent()

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: a69b080025ea ("scsi: bfa: use dma_set_mask_and_coherent")
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 18 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/scsi/bfa/bfad.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c
index 42a0caf..88880a6 100644
--- a/drivers/scsi/bfa/bfad.c
+++ b/drivers/scsi/bfa/bfad.c
@@ -727,7 +727,7 @@ struct bfad_port_s *
 int
 bfad_pci_init(struct pci_dev *pdev, struct bfad_s *bfad)
 {
-   int     rc = -ENODEV;
+   int rc = -ENODEV;

    if (pci_enable_device(pdev)) {
        printk(KERN_ERR "pci_enable_device fail %p\n", pdev);
@@ -739,8 +739,12 @@ struct bfad_port_s *

    pci_set_master(pdev);

-   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) {
+       rc = -ENODEV;
        printk(KERN_ERR "dma_set_mask_and_coherent fail %p\n", pdev);
        goto out_release_region;
    }
@@ -1534,6 +1538,7 @@ struct bfad_port_s *
 {
    struct bfad_s *bfad = pci_get_drvdata(pdev);
    u8 byte;
+   int rc;

    dev_printk(KERN_ERR, &pdev->dev,
           "bfad_pci_slot_reset flags: 0x%x\n", bfad->bfad_flags);
@@ -1561,8 +1566,11 @@ struct bfad_port_s *
    pci_save_state(pdev);
    pci_set_master(pdev);

-   if (dma_set_mask_and_coherent(&bfad->pcidev->dev, DMA_BIT_MASK(64)) ||
-       dma_set_mask_and_coherent(&bfad->pcidev->dev, DMA_BIT_MASK(32)))
+   rc = dma_set_mask_and_coherent(&bfad->pcidev->dev, DMA_BIT_MASK(64));
+   if (rc)
+       rc = dma_set_mask_and_coherent(&bfad->pcidev->dev,
+                          DMA_BIT_MASK(32));
+   if (rc)
        goto out_disable_device;

    if (restart_bfa(bfad) == -1)

Leave a Reply

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