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>

diff --git a/drivers/thunderbolt/nhi.c b/drivers/thunderbolt/nhi.c
index f5a33e88e676160c4d4c1ca091ce3680a470207a..e3b7695fe37e94ba754aa1bb75bca8207312e244 100644 (file)
--- 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);