diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2015-03-26 01:14:45 +0000 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2015-03-26 01:14:45 +0000 |
| commit | b4512393acd627e61019975bcf6084a0ebd25439 (patch) | |
| tree | 128ea7f7e9b29a46bff5c5be2e37af04c65f6e7d /usb-make-xhci-platform-driver-use-64-bit-or-32-bit-D.patch | |
| parent | b6d84528bca03e062e1108865cc293026c5a3298 (diff) | |
| download | kernel-b4512393acd627e61019975bcf6084a0ebd25439.tar.gz kernel-b4512393acd627e61019975bcf6084a0ebd25439.tar.xz kernel-b4512393acd627e61019975bcf6084a0ebd25439.zip | |
Add aarch64 patches to fix mustang usb, seattle eth, and console settings
Diffstat (limited to 'usb-make-xhci-platform-driver-use-64-bit-or-32-bit-D.patch')
| -rw-r--r-- | usb-make-xhci-platform-driver-use-64-bit-or-32-bit-D.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/usb-make-xhci-platform-driver-use-64-bit-or-32-bit-D.patch b/usb-make-xhci-platform-driver-use-64-bit-or-32-bit-D.patch new file mode 100644 index 000000000..37ada093b --- /dev/null +++ b/usb-make-xhci-platform-driver-use-64-bit-or-32-bit-D.patch @@ -0,0 +1,44 @@ +From 30b01a7a85c0a2993870f7ed93059f9957bff59f Mon Sep 17 00:00:00 2001
+From: Mark Langsdorf <mlangsdo@redhat.com>
+Date: Wed, 25 Mar 2015 14:12:51 -0400
+Subject: [PATCH 3/4] usb: make xhci platform driver use 64 bit or 32 bit DMA
+
+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@redhat.com>
+---
+ drivers/usb/host/xhci-plat.c | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
+index 0e11d61..cc5ca2c 100644
+--- a/drivers/usb/host/xhci-plat.c
++++ b/drivers/usb/host/xhci-plat.c
+@@ -83,14 +83,13 @@ static int xhci_plat_probe(struct platform_device *pdev)
+ 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)
+--
+1.9.3
+
|