summaryrefslogtreecommitdiffstats
path: root/drivers/thunderbolt
diff options
context:
space:
mode:
authorMika Westerberg <mika.westerberg@linux.intel.com>2018-07-25 11:03:16 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-07-25 10:15:24 +0200
commitdba3caf6210397635714c7f46129d8c0c9af2512 (patch)
tree98324082833523b68a6c7f8cb0970de369da15e8 /drivers/thunderbolt
parentc356915ebc9ddb8303feeab1e3465170285558b5 (diff)
downloadlinux-stable-dba3caf6210397635714c7f46129d8c0c9af2512.tar.gz
linux-stable-dba3caf6210397635714c7f46129d8c0c9af2512.tar.bz2
linux-stable-dba3caf6210397635714c7f46129d8c0c9af2512.zip
thunderbolt: Use 64-bit DMA mask if supported by the platform
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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/thunderbolt')
-rw-r--r--drivers/thunderbolt/nhi.c8
1 files changed, 8 insertions, 0 deletions
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);