From: Hannes Reinecke <hare@suse.de>
To: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>,
James Bottomley <james.bottomley@hansenpartnership.com>,
linux-scsi@vger.kernel.org, Hannes Reinecke <hare@suse.de>,
stable@vger.kernel.org, Hannes Reinecke <hare@suse.com>
Subject: [PATCH 2/8] 3w-9xxx: fix calls to dma_set_mask_and_coherent()
Date: Mon, 18 Feb 2019 08:34:20 +0100 [thread overview]
Message-ID: <20190218073426.111853-3-hare@suse.de> (raw)
In-Reply-To: <20190218073426.111853-1-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.
Fixes: b000bced5739 ("scsi: 3w-9xxx: fully convert to the generic DMA API")
Cc: <stable@vger.kernel.org>
Signed-off-by: Hannes Reinecke <hare@suse.com>
---
drivers/scsi/3w-9xxx.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
index a3c20e3a8b7c..3337b1e80412 100644
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
@@ -2009,7 +2009,7 @@ static int twa_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)
struct Scsi_Host *host = NULL;
TW_Device_Extension *tw_dev;
unsigned long mem_addr, mem_len;
- int retval = -ENODEV;
+ int retval;
retval = pci_enable_device(pdev);
if (retval) {
@@ -2020,8 +2020,10 @@ static int twa_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)
pci_set_master(pdev);
pci_try_set_mwi(pdev);
- if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)) ||
- dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32))) {
+ retval = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
+ if (retval)
+ retval = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
+ if (retval) {
TW_PRINTK(host, TW_DRIVER, 0x23, "Failed to set dma mask");
retval = -ENODEV;
goto out_disable_device;
@@ -2240,8 +2242,10 @@ static int twa_resume(struct pci_dev *pdev)
pci_set_master(pdev);
pci_try_set_mwi(pdev);
- if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)) ||
- dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32))) {
+ retval = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
+ if (retval)
+ retval = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
+ if (retval) {
TW_PRINTK(host, TW_DRIVER, 0x40, "Failed to set dma mask during resume");
retval = -ENODEV;
goto out_disable_device;
--
2.16.4
next prev parent reply other threads:[~2019-02-18 7:34 UTC|newest]
Thread overview: 25+ 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 ` Hannes Reinecke [this message]
2019-02-18 9:24 ` [PATCH 2/8] 3w-9xxx: " 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
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: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=20190218073426.111853-3-hare@suse.de \
--to=hare@suse.de \
--cc=hare@suse.com \
--cc=hch@lst.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).