Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'powerpc-7.0-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fix from Madhavan Srinivasan:
- fix iommu incorrectly bypassing DMA APIs
Thanks to Dan Horak, Gaurav Batra, and Ritesh Harjani (IBM).
* tag 'powerpc-7.0-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc/powernv/iommu: iommu incorrectly bypass DMA APIs
+2
-2
+2
-2
arch/powerpc/kernel/dma-iommu.c
+2
-2
arch/powerpc/kernel/dma-iommu.c
···
67
67
}
68
68
bool arch_dma_alloc_direct(struct device *dev)
69
69
{
70
-
if (dev->dma_ops_bypass)
70
+
if (dev->dma_ops_bypass && dev->bus_dma_limit)
71
71
return true;
72
72
73
73
return false;
···
75
75
76
76
bool arch_dma_free_direct(struct device *dev, dma_addr_t dma_handle)
77
77
{
78
-
if (!dev->dma_ops_bypass)
78
+
if (!dev->dma_ops_bypass || !dev->bus_dma_limit)
79
79
return false;
80
80
81
81
return is_direct_handle(dev, dma_handle);