Commit dba3caf6 authored by Mika Westerberg's avatar Mika Westerberg Committed by Greg Kroah-Hartman
Browse files

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: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c356915e

drivers/thunderbolt/nhi.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -1015,6 +1015,14 @@ static int nhi_probe(struct pci_dev *pdev, const struct pci_device_id *id) 




	spin_lock_init(&nhi->lock);

	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);

	pci_set_master(pdev);





	tb = icm_probe(nhi);

	tb = icm_probe(nhi);

CRA Git | Maintained and supported by SUSTech CRA and CCSE