From: Ewan Milne <emilne@redhat.com>
To: Hannes Reinecke <hare@suse.de>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>,
James Bottomley <james.bottomley@hansenpartnership.com>,
linux-scsi@vger.kernel.org, stable@vger.kernel.org
Subject: Re: [PATCH 5/8] bfa: fix calls to dma_set_mask_and_coherent()
Date: Mon, 25 Feb 2019 19:34:23 -0500 (EST) [thread overview]
Message-ID: <999117296.3870120.1551141263203.JavaMail.zimbra@redhat.com> (raw)
In-Reply-To: <20190218073426.111853-6-hare@suse.de>
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 FC connections failing due
to corrupted data buffers, and various other SCSI/FCP I/O errors.
Fixes: a69b080025ea ("scsi: bfa: 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>
---
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 42a0caf6740d..88880a66a189 100644
--- a/drivers/scsi/bfa/bfad.c
+++ b/drivers/scsi/bfa/bfad.c
@@ -727,7 +727,7 @@ bfad_init_timer(struct bfad_s *bfad)
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 @@ bfad_pci_init(struct pci_dev *pdev, struct bfad_s *bfad)
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 @@ bfad_pci_slot_reset(struct pci_dev *pdev)
{
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 @@ bfad_pci_slot_reset(struct pci_dev *pdev)
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)
--
2.16.4
Can we remove the last sentence "This resulted in...", Martin?
Reviewed-by: Ewan D. Milne <emilne@redhat.com>
next prev parent reply other threads:[~2019-02-26 0:34 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190218073426.111853-1-hare@suse.de>
2019-02-18 7:34 ` [PATCH 1/8] lpfc: fix calls to dma_set_mask_and_coherent() Hannes Reinecke
2019-02-18 9:24 ` Christoph Hellwig
2019-02-26 0:29 ` Ewan Milne
2019-02-18 7:34 ` [PATCH 2/8] 3w-9xxx: " Hannes Reinecke
2019-02-18 9:24 ` Christoph Hellwig
2019-02-26 0:30 ` Ewan Milne
2019-02-18 7:34 ` [PATCH 3/8] 3w-sas: " Hannes Reinecke
2019-02-18 9:24 ` Christoph Hellwig
2019-02-26 0:30 ` Ewan Milne
2019-02-18 7:34 ` [PATCH 4/8] " Hannes Reinecke
2019-02-18 9:25 ` Christoph Hellwig
2019-02-26 0:32 ` Ewan Milne
2019-02-18 7:34 ` [PATCH 5/8] bfa: " Hannes Reinecke
2019-02-18 9:25 ` Christoph Hellwig
2019-02-26 0:34 ` Ewan Milne [this message]
2019-02-18 7:34 ` [PATCH 6/8] csiostor: " Hannes Reinecke
2019-02-18 9:25 ` Christoph Hellwig
2019-02-26 0:35 ` Ewan Milne
2019-02-18 7:34 ` [PATCH 7/8] hisi_sas: " Hannes Reinecke
2019-02-18 9:24 ` John Garry
2019-02-18 9:24 ` John Garry
2019-02-18 9:26 ` Christoph Hellwig
2019-02-26 0:37 ` Ewan Milne
2019-02-18 7:34 ` [PATCH 8/8] hptiop: fix calls to dma_set_mask() Hannes Reinecke
2019-02-18 9:26 ` Christoph Hellwig
2019-02-26 0:38 ` Ewan Milne
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=999117296.3870120.1551141263203.JavaMail.zimbra@redhat.com \
--to=emilne@redhat.com \
--cc=hare@suse.de \
--cc=james.bottomley@hansenpartnership.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.