49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
From: Mark Langsdorf <mlangsdo-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
|
|
Subject: [PATCH v3 1/2] make xhci platform driver use 64 bit or 32 bit DMA
|
|
Date: Tue, 25 Nov 2014 15:19:25 -0600
|
|
Origin: http://permalink.gmane.org/gmane.linux.usb.general/118786
|
|
Bug-Debian: https://bugs.debian.org/785707
|
|
|
|
The xhci platform driver needs to work on systems that either only
|
|
support 64-bit DMA or only support 32-bit DMA. Attempt to set a
|
|
coherent dma mask for 64-bit DMA, and attempt again with 32-bit
|
|
DMA if that fails.
|
|
|
|
Signed-off-by: Mark Langsdorf <mlangsdo-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
|
|
Tested-by: Mark Salter <msalter-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
|
|
---
|
|
Changes from v2:
|
|
None
|
|
Changes from v1:
|
|
Consolidated to use dma_set_mask_and_coherent
|
|
Got rid of the check against sizeof(dma_addr_t)
|
|
|
|
drivers/usb/host/xhci-plat.c | 16 ++++++++--------
|
|
1 file changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
--- a/drivers/usb/host/xhci-plat.c
|
|
+++ b/drivers/usb/host/xhci-plat.c
|
|
@@ -83,14 +83,14 @@ static int xhci_plat_probe(struct platfo
|
|
if (irq < 0)
|
|
return -ENODEV;
|
|
|
|
- /* Initialize dma_mask and coherent_dma_mask to 32-bits */
|
|
- ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
|
|
- if (ret)
|
|
- return ret;
|
|
- if (!pdev->dev.dma_mask)
|
|
- pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
|
|
- else
|
|
- dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
|
|
+ /* Try setting the coherent_dma_mask to 64 bits, then try 32 bits */
|
|
+ ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
|
|
+ if (ret) {
|
|
+ ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
|
|
+ if (ret)
|
|
+ return ret;
|
|
+ }
|
|
+
|
|
|
|
hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));
|
|
if (!hcd)
|