[PATCH] iommu/io-pgtable-arm: Fix io-pgtable-arm build failure

[PATCH] iommu/io-pgtable-arm: Fix io-pgtable-arm build failure

[Will Deacon]

From: Lada Trimasova <Lada.Trimasova@synopsys.com>

Trying to build a kernel for ARC with both options CONFIG_COMPILE_TEST
and CONFIG_IOMMU_IO_PGTABLE_LPAE enabled (e.g. as a result of "make
allyesconfig") results in the following build failure:

 | CC drivers/iommu/io-pgtable-arm.o
 | linux/drivers/iommu/io-pgtable-arm.c: In
 | function ‘__arm_lpae_alloc_pages’:
 | linux/drivers/iommu/io-pgtable-arm.c:221:3:
 | error: implicit declaration of function ‘dma_map_single’
 | [-Werror=implicit-function-declaration]
 | dma = dma_map_single(dev, pages, size, DMA_TO_DEVICE);
 | ^
 | linux/drivers/iommu/io-pgtable-arm.c:221:42:
 | error: ‘DMA_TO_DEVICE’ undeclared (first use in this function)
 | dma = dma_map_single(dev, pages, size, DMA_TO_DEVICE);
 | ^

Since IOMMU_IO_PGTABLE_LPAE depends on DMA API, io-pgtable-arm.c should
include linux/dma-mapping.h. This fixes the reported failure.

Cc: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Joerg Roedel <joro@8bytes.org>
Signed-off-by: Lada Trimasova <ltrimas@synopsys.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---

Joerg -- can you pick this up as a fix for 4.5, please? I don't have
         any other fixes queued, so a pull request seems a bit OTT.

 drivers/iommu/io-pgtable-arm.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
index 8bbcbfe7695c..381ca5a37a7b 100644
--- a/drivers/iommu/io-pgtable-arm.c
+++ b/drivers/iommu/io-pgtable-arm.c
@@ -25,6 +25,7 @@
 #include <linux/sizes.h>
 #include <linux/slab.h>
 #include <linux/types.h>
+#include <linux/dma-mapping.h>
 
 #include <asm/barrier.h>
 
-- 
2.1.4

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

Re: [PATCH] iommu/io-pgtable-arm: Fix io-pgtable-arm build failure

[Joerg Roedel]

On Wed, Jan 27, 2016 at 11:10:32AM +0000, Will Deacon wrote:
> From: Lada Trimasova <Lada.Trimasova@synopsys.com>
> 
> Trying to build a kernel for ARC with both options CONFIG_COMPILE_TEST
> and CONFIG_IOMMU_IO_PGTABLE_LPAE enabled (e.g. as a result of "make
> allyesconfig") results in the following build failure:
> 
>  | CC drivers/iommu/io-pgtable-arm.o
>  | linux/drivers/iommu/io-pgtable-arm.c: In
>  | function ‘__arm_lpae_alloc_pages’:
>  | linux/drivers/iommu/io-pgtable-arm.c:221:3:
>  | error: implicit declaration of function ‘dma_map_single’
>  | [-Werror=implicit-function-declaration]
>  | dma = dma_map_single(dev, pages, size, DMA_TO_DEVICE);
>  | ^
>  | linux/drivers/iommu/io-pgtable-arm.c:221:42:
>  | error: ‘DMA_TO_DEVICE’ undeclared (first use in this function)
>  | dma = dma_map_single(dev, pages, size, DMA_TO_DEVICE);
>  | ^
> 
> Since IOMMU_IO_PGTABLE_LPAE depends on DMA API, io-pgtable-arm.c should
> include linux/dma-mapping.h. This fixes the reported failure.
> 
> Cc: Alexey Brodkin <abrodkin@synopsys.com>
> Cc: Vineet Gupta <vgupta@synopsys.com>
> Cc: Joerg Roedel <joro@8bytes.org>
> Signed-off-by: Lada Trimasova <ltrimas@synopsys.com>
> Signed-off-by: Will Deacon <will.deacon@arm.com>
> ---
> 
> Joerg -- can you pick this up as a fix for 4.5, please? I don't have
>          any other fixes queued, so a pull request seems a bit OTT.

Applied, thanks Will.

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu