| Message ID | 20190213114234.67275-3-hare@suse.de (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | scsi: fixup dma_set_mask_and_coherent() calls | expand |
The patch subject line is incorrect, the driver was changed to call dma_set_mask(), not dma_set_mask_and_coherent(). Also see comments below re: the patch description. The code itself looks fine. -Ewan On Wed, 2019-02-13 at 12:42 +0100, Hannes Reinecke wrote: > 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. ------------------------------------------------------------------- The last sentence should be removed from the patch description. And the second-to-last sentence should say something like "..the first DMA mask...". > > Fixes: 453cd3700ca3 ("scsi: hptiop: use dma_set_mask") > Cc: <stable@vger.kernel.org> > Suggested-by: Ewan D. Milne <emilne@redhat.com> > Signed-off-by: Hannes Reinecke <hare@suse.com> > --- > 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 3eedfd4f8f57..251c084a6ff0 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; > }
diff --git a/drivers/scsi/hptiop.c b/drivers/scsi/hptiop.c index 3eedfd4f8f57..251c084a6ff0 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; }
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: 453cd3700ca3 ("scsi: hptiop: use dma_set_mask") Cc: <stable@vger.kernel.org> Suggested-by: Ewan D. Milne <emilne@redhat.com> Signed-off-by: Hannes Reinecke <hare@suse.com> --- drivers/scsi/hptiop.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)