From: John Garry <john.garry@huawei.com>
To: <jejb@linux.vnet.ibm.com>, <martin.petersen@oracle.com>
Cc: <linuxarm@huawei.com>, <zhangfei.gao@linaro.org>,
<xuwei5@hisilicon.com>, <john.garry2@mail.dcu.ie>,
<linux-scsi@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
John Garry <john.garry@huawei.com>,
"Xiang Chen" <chenxiang66@hisilicon.com>
Subject: [PATCH 09/15] hisi_sas: set dma mask before allocate DMA memory
Date: Tue, 6 Sep 2016 23:36:19 +0800 [thread overview]
Message-ID: <1473176185-217808-10-git-send-email-john.garry@huawei.com> (raw)
In-Reply-To: <1473176185-217808-1-git-send-email-john.garry@huawei.com>
The device DMA mask was being set after the bulk of the
DMA allocations in the driver init, so potentially
DMA allocates fail.
To resolve, relocate before allocating the DMA memory when
initialising the driver.
Signed-off-by: Xiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: John Garry <john.garry@huawei.com>
---
drivers/scsi/hisi_sas/hisi_sas_main.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
index d58e223..2f872f7 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -1439,6 +1439,12 @@ static struct Scsi_Host *hisi_sas_shost_alloc(struct platform_device *pdev,
&hisi_hba->queue_count))
goto err_out;
+ if (dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64)) &&
+ dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32))) {
+ dev_err(dev, "No usable DMA addressing method\n");
+ goto err_out;
+ }
+
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
hisi_hba->regs = devm_ioremap_resource(dev, res);
if (IS_ERR(hisi_hba->regs))
@@ -1486,13 +1492,6 @@ int hisi_sas_probe(struct platform_device *pdev,
hisi_hba = shost_priv(shost);
platform_set_drvdata(pdev, sha);
- if (dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64)) &&
- dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32))) {
- dev_err(dev, "No usable DMA addressing method\n");
- rc = -EIO;
- goto err_out_ha;
- }
-
phy_nr = port_nr = hisi_hba->n_phy;
arr_phy = devm_kcalloc(dev, phy_nr, sizeof(void *), GFP_KERNEL);
--
1.9.1
next prev parent reply other threads:[~2016-09-06 15:31 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-06 15:36 [PATCH 00/15] hisi_sas misc fixes and minor optimisations John Garry
2016-09-06 15:36 ` [PATCH 01/15] hisi_sas: save completion queue read pointer John Garry
2016-09-14 11:46 ` Hannes Reinecke
2016-09-06 15:36 ` [PATCH 02/15] hisi_sas: save delivery queue write pointer John Garry
2016-09-14 11:47 ` Hannes Reinecke
2016-09-06 15:36 ` [PATCH 03/15] hisi_sas: keep CHL_INT2 masked for v2 HW John Garry
2016-09-14 11:48 ` Hannes Reinecke
2016-09-06 15:36 ` [PATCH 04/15] hisi_sas: only zero slot memory when reused John Garry
2016-09-14 12:45 ` Hannes Reinecke
2016-09-06 15:36 ` [PATCH 05/15] hisi_sas: use safe BITS_PER_BYTE for slot tag size calculation John Garry
2016-09-14 12:46 ` Hannes Reinecke
2016-09-06 15:36 ` [PATCH 06/15] hisi_sas: disable dlvry queues once at reset for v2 hw John Garry
2016-09-14 12:46 ` Hannes Reinecke
2016-09-06 15:36 ` [PATCH 07/15] hisi_sas: fix phy8 linkrate calculation in phy_up_v2_hw() John Garry
2016-09-14 12:47 ` Hannes Reinecke
2016-09-06 15:36 ` [PATCH 08/15] hisi_sas: fix a potential warning for sata disk ejection John Garry
2016-09-14 12:48 ` Hannes Reinecke
2016-09-06 15:36 ` John Garry [this message]
2016-09-14 12:48 ` [PATCH 09/15] hisi_sas: set dma mask before allocate DMA memory Hannes Reinecke
2016-09-06 15:36 ` [PATCH 10/15] hisi_sas: fix HBA SAS addr endianness for v2 hw John Garry
2016-09-14 12:49 ` Hannes Reinecke
2016-09-06 15:36 ` [PATCH 11/15] hisi_sas: fix HBA SAS addr endianness for v1 hw John Garry
2016-09-14 12:49 ` Hannes Reinecke
2016-09-06 15:36 ` [PATCH 12/15] hisi_sas: remove init_id_frame_v2_hw() John Garry
2016-09-14 12:50 ` Hannes Reinecke
2016-09-06 15:36 ` [PATCH 13/15] hisi_sas: remove init_id_frame_v1_hw() John Garry
2016-09-14 12:50 ` Hannes Reinecke
2016-09-06 15:36 ` [PATCH 14/15] hisi_sas: add missing SATA pending device type to v2 hw John Garry
2016-09-14 12:51 ` Hannes Reinecke
2016-09-06 15:36 ` [PATCH 15/15] hisi_sas: send three identify before phy up John Garry
2016-09-14 12:52 ` Hannes Reinecke
2016-09-14 16:54 ` [PATCH 00/15] hisi_sas misc fixes and minor optimisations Martin K. Petersen
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=1473176185-217808-10-git-send-email-john.garry@huawei.com \
--to=john.garry@huawei.com \
--cc=chenxiang66@hisilicon.com \
--cc=jejb@linux.vnet.ibm.com \
--cc=john.garry2@mail.dcu.ie \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=martin.petersen@oracle.com \
--cc=xuwei5@hisilicon.com \
--cc=zhangfei.gao@linaro.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
all inboxes | Powered by JetHome®