Commit 936376f8 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

arm: select the dma-noncoherent symbols for all swiotlb builds 



We need to provide the arch hooks for non-coherent dma-direct
and swiotlb for all swiotlb builds, not just when LPAS is enabled.
Without that the Xen build that selects SWIOTLB indirectly through
SWIOTLB_XEN fails to build.

Fixes: ad3c7b18 ("arm: use swiotlb for bounce buffering on LPAE configs")
Reported-by: default avatarStefan Wahren <wahrenst@gmx.net>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Tested-by: default avatarStefan Wahren <wahrenst@gmx.net>
parent d1abaeb3

arch/arm/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ config ARM 
	select ARCH_HAS_BINFMT_FLAT

	select ARCH_HAS_DEBUG_VIRTUAL if MMU

	select ARCH_HAS_DEVMEM_IS_ALLOWED

	select ARCH_HAS_DMA_COHERENT_TO_PFN if SWIOTLB

	select ARCH_HAS_DMA_MMAP_PGPROT if SWIOTLB

	select ARCH_HAS_ELF_RANDOMIZE

	select ARCH_HAS_FORTIFY_SOURCE

	select ARCH_HAS_KEEPINITRD
@@ -18,6 +20,8 @@ config ARM 
	select ARCH_HAS_SET_MEMORY

	select ARCH_HAS_STRICT_KERNEL_RWX if MMU && !XIP_KERNEL

	select ARCH_HAS_STRICT_MODULE_RWX if MMU

	select ARCH_HAS_SYNC_DMA_FOR_DEVICE if SWIOTLB

	select ARCH_HAS_SYNC_DMA_FOR_CPU if SWIOTLB

	select ARCH_HAS_TEARDOWN_DMA_OPS if MMU

	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_HAVE_CUSTOM_GPIO_H

arch/arm/mm/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -664,10 +664,6 @@ config ARM_LPAE 
		!CPU_32v4 && !CPU_32v3

	select PHYS_ADDR_T_64BIT

	select SWIOTLB

	select ARCH_HAS_DMA_COHERENT_TO_PFN

	select ARCH_HAS_DMA_MMAP_PGPROT

	select ARCH_HAS_SYNC_DMA_FOR_DEVICE

	select ARCH_HAS_SYNC_DMA_FOR_CPU

	help

	  Say Y if you have an ARMv7 processor supporting the LPAE page

	  table format and you would like to access memory beyond the

CRA Git | Maintained and supported by SUSTech CRA and CCSE