Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...

[sfrench/cifs-2.6.git] / arch / arm64 / mm / dma-mapping.c

diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
index db01f2709842426ffb99ac0e85339d86f733be61..49e217ac7e1ec2087c440c60ec71126f0e48ec32 100644 (file)
--- a/arch/arm64/mm/dma-mapping.c
+++ b/arch/arm64/mm/dma-mapping.c
@@ -504,6 +504,11 @@ static int __init arm64_dma_init(void)
            max_pfn > (arm64_dma_phys_limit >> PAGE_SHIFT))
                swiotlb = 1;
 
+       WARN_TAINT(ARCH_DMA_MINALIGN < cache_line_size(),
+                  TAINT_CPU_OUT_OF_SPEC,
+                  "ARCH_DMA_MINALIGN smaller than CTR_EL0.CWG (%d < %d)",
+                  ARCH_DMA_MINALIGN, cache_line_size());
+
        return atomic_pool_init();
 }
 arch_initcall(arm64_dma_init);