| Message ID | 20210208145024.3320420-7-hch@lst.de (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/6] MIPS/malta: simplify plat_setup_iocoherency | expand |
Reviewed-by: Huacai Chen <chenhuacai@kernel.org> On Mon, Feb 8, 2021 at 10:51 PM Christoph Hellwig <hch@lst.de> wrote: > > Just select DMA_NONCOHERENT and ARCH_HAS_SETUP_DMA_OPS from the > MIPS_GENERIC platform instead. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > arch/mips/Kconfig | 8 ++------ > arch/mips/mm/dma-noncoherent.c | 2 +- > 2 files changed, 3 insertions(+), 7 deletions(-) > > diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig > index 1f1603a08a6d2d..fae02b0b9c599a 100644 > --- a/arch/mips/Kconfig > +++ b/arch/mips/Kconfig > @@ -123,6 +123,7 @@ choice > > config MIPS_GENERIC_KERNEL > bool "Generic board-agnostic MIPS kernel" > + select ARCH_HAS_SETUP_DMA_OPS > select MIPS_GENERIC > select BOOT_RAW > select BUILTIN_DTB > @@ -132,7 +133,7 @@ config MIPS_GENERIC_KERNEL > select CPU_MIPSR2_IRQ_EI > select CPU_MIPSR2_IRQ_VI > select CSRC_R4K > - select DMA_PERDEV_COHERENT > + select DMA_NONCOHERENT > select HAVE_PCI > select IRQ_MIPS_CPU > select MIPS_AUTO_PFN_OFFSET > @@ -1127,11 +1128,6 @@ config FW_CFE > config ARCH_SUPPORTS_UPROBES > bool > > -config DMA_PERDEV_COHERENT > - bool > - select ARCH_HAS_SETUP_DMA_OPS > - select DMA_NONCOHERENT > - > config DMA_NONCOHERENT > bool > # > diff --git a/arch/mips/mm/dma-noncoherent.c b/arch/mips/mm/dma-noncoherent.c > index 90b562753eb892..212f3ce75a6bd3 100644 > --- a/arch/mips/mm/dma-noncoherent.c > +++ b/arch/mips/mm/dma-noncoherent.c > @@ -135,7 +135,7 @@ void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size, > } > #endif > > -#ifdef CONFIG_DMA_PERDEV_COHERENT > +#ifdef CONFIG_ARCH_HAS_SETUP_DMA_OPS > void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, > const struct iommu_ops *iommu, bool coherent) > { > -- > 2.29.2 >
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 1f1603a08a6d2d..fae02b0b9c599a 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -123,6 +123,7 @@ choice config MIPS_GENERIC_KERNEL bool "Generic board-agnostic MIPS kernel" + select ARCH_HAS_SETUP_DMA_OPS select MIPS_GENERIC select BOOT_RAW select BUILTIN_DTB @@ -132,7 +133,7 @@ config MIPS_GENERIC_KERNEL select CPU_MIPSR2_IRQ_EI select CPU_MIPSR2_IRQ_VI select CSRC_R4K - select DMA_PERDEV_COHERENT + select DMA_NONCOHERENT select HAVE_PCI select IRQ_MIPS_CPU select MIPS_AUTO_PFN_OFFSET @@ -1127,11 +1128,6 @@ config FW_CFE config ARCH_SUPPORTS_UPROBES bool -config DMA_PERDEV_COHERENT - bool - select ARCH_HAS_SETUP_DMA_OPS - select DMA_NONCOHERENT - config DMA_NONCOHERENT bool # diff --git a/arch/mips/mm/dma-noncoherent.c b/arch/mips/mm/dma-noncoherent.c index 90b562753eb892..212f3ce75a6bd3 100644 --- a/arch/mips/mm/dma-noncoherent.c +++ b/arch/mips/mm/dma-noncoherent.c @@ -135,7 +135,7 @@ void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size, } #endif -#ifdef CONFIG_DMA_PERDEV_COHERENT +#ifdef CONFIG_ARCH_HAS_SETUP_DMA_OPS void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, const struct iommu_ops *iommu, bool coherent) {
Just select DMA_NONCOHERENT and ARCH_HAS_SETUP_DMA_OPS from the MIPS_GENERIC platform instead. Signed-off-by: Christoph Hellwig <hch@lst.de> --- arch/mips/Kconfig | 8 ++------ arch/mips/mm/dma-noncoherent.c | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-)