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

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

This Linux kernel change "scsi: lpfc: 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:19 2019 +0100. The commit for this change in Linux stable tree is 56de835 (patch).

scsi: lpfc: 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.  This resulted in NVMe/FC connections failing due to
corrupted data buffers, and various other SCSI/FCP I/O errors.

Fixes: f30e1bfd6154 ("scsi: lpfc: use dma_set_mask_and_coherent")
Cc: <[email protected]>
Suggested-by: Don Dutile <[email protected]>
Signed-off-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 19 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/scsi/lpfc/lpfc_init.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index c1c3681..a588dfa 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -7361,15 +7361,18 @@ struct lpfc_rpi_hdr *
    unsigned long bar0map_len, bar2map_len;
    int i, hbq_count;
    void *ptr;
-   int error = -ENODEV;
+   int error;

    if (!pdev)
-       return error;
+       return -ENODEV;

    /* Set the device DMA mask size */
-   if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)) ||
-       dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)))
+   error = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
+   if (error)
+       error = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
+   if (error)
        return error;
+   error = -ENODEV;

    /* Get the bus address of Bar0 and Bar2 and the number of bytes
     * required by each mapping.
@@ -9742,11 +9745,13 @@ struct lpfc_cq_event *
    uint32_t if_type;

    if (!pdev)
-       return error;
+       return -ENODEV;

    /* Set the device DMA mask size */
-   if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)) ||
-       dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)))
+   error = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
+   if (error)
+       error = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
+   if (error)
        return error;

    /*

Leave a Reply

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