984fc8
From: Mark Langsdorf <mlangsdo@redhat.com>
984fc8
Date: Wed, 25 Mar 2015 14:12:51 -0400
2aa360
Subject: [PATCH] usb: make xhci platform driver use 64 bit or 32 bit DMA
984fc8
984fc8
The xhci platform driver needs to work on systems that either only
984fc8
support 64-bit DMA or only support 32-bit DMA. Attempt to set a
984fc8
coherent dma mask for 64-bit DMA, and attempt again with 32-bit
984fc8
DMA if that fails.
984fc8
984fc8
Signed-off-by: Mark Langsdorf <mlangsdo@redhat.com>
984fc8
---
984fc8
 drivers/usb/host/xhci-plat.c | 15 +++++++--------
984fc8
 1 file changed, 7 insertions(+), 8 deletions(-)
984fc8
984fc8
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
76c11d
index 890ad9d9d329..122b1fb12b7e 100644
984fc8
--- a/drivers/usb/host/xhci-plat.c
984fc8
+++ b/drivers/usb/host/xhci-plat.c
76c11d
@@ -93,14 +93,13 @@ static int xhci_plat_probe(struct platform_device *pdev)
984fc8
 	if (irq < 0)
984fc8
 		return -ENODEV;
984fc8
 
984fc8
-	/* Initialize dma_mask and coherent_dma_mask to 32-bits */
984fc8
-	ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
984fc8
-	if (ret)
984fc8
-		return ret;
984fc8
-	if (!pdev->dev.dma_mask)
984fc8
-		pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
984fc8
-	else
984fc8
-		dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
984fc8
+	/* Try setting the coherent_dma_mask to 64 bits, then try 32 bits */
984fc8
+	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
984fc8
+	if (ret) {
984fc8
+		ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
984fc8
+		if (ret)
984fc8
+			return ret;
984fc8
+	}
984fc8
 
984fc8
 	hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));
984fc8
 	if (!hcd)