All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mika Westerberg <mika.westerberg@linux.intel.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Andreas Noever <andreas.noever@gmail.com>,
	Michael Jamet <michael.jamet@intel.com>,
	Yehezkel Bernat <YehezkelShB@gmail.com>,
	Mika Westerberg <mika.westerberg@linux.intel.com>,
	linux-kernel@vger.kernel.org
Subject: [PATCH 2/7] thunderbolt: Use 64-bit DMA mask if supported by the platform
Date: Wed, 25 Jul 2018 11:03:16 +0300	[thread overview]
Message-ID: <20180725080321.35746-3-mika.westerberg@linux.intel.com> (raw)
In-Reply-To: <20180725080321.35746-1-mika.westerberg@linux.intel.com>

PCI defaults to 32-bit DMA mask but this device is capable of full
64-bit addressing, so make sure we first try 64-bit DMA mask before
falling back to the default 32-bit.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---
 drivers/thunderbolt/nhi.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/thunderbolt/nhi.c b/drivers/thunderbolt/nhi.c
index f5a33e88e676..e3b7695fe37e 100644
--- a/drivers/thunderbolt/nhi.c
+++ b/drivers/thunderbolt/nhi.c
@@ -1015,6 +1015,14 @@ static int nhi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
 	spin_lock_init(&nhi->lock);
 
+	res = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
+	if (res)
+		res = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
+	if (res) {
+		dev_err(&pdev->dev, "failed to set DMA mask\n");
+		return res;
+	}
+
 	pci_set_master(pdev);
 
 	tb = icm_probe(nhi);
-- 
2.18.0


  parent reply	other threads:[~2018-07-25  8:03 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-25  8:03 [PATCH 0/7] thunderbolt: Changes for v4.19 merge window Mika Westerberg
2018-07-25  8:03 ` [PATCH 1/7] thunderbolt: Fix small typo in variable name Mika Westerberg
2018-07-25  8:03 ` Mika Westerberg [this message]
2018-07-25  8:03 ` [PATCH 3/7] thunderbolt: Do not unnecessarily call ICM get route Mika Westerberg
2018-07-25  8:03 ` [PATCH 4/7] thunderbolt: No need to take tb->lock in domain suspend/complete Mika Westerberg
2018-07-25  8:03 ` [PATCH 5/7] thunderbolt: Use correct ICM commands in system suspend Mika Westerberg
2018-07-25  8:03 ` [PATCH 6/7] thunderbolt: Add support for runtime PM Mika Westerberg
2018-07-25  8:17   ` Greg Kroah-Hartman
2018-07-25  8:43     ` Mika Westerberg
2018-07-25  8:48   ` [PATCH v2 " Mika Westerberg
2018-07-25  8:03 ` [PATCH 7/7] thunderbolt: Remove redundant variable 'approved' Mika Westerberg

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=20180725080321.35746-3-mika.westerberg@linux.intel.com \
    --to=mika.westerberg@linux.intel.com \
    --cc=YehezkelShB@gmail.com \
    --cc=andreas.noever@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=michael.jamet@intel.com \
    /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.