tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

MIPS: IP27: Switch from DMA_IP27 to DMA_COHERENT

The special IP27 DMA code selected by DMA_IP27 has been removed a while
ago turning DMA_IP27 into almost a nop. Also fixup the broken logic of
its last users memcpy.S and memcpy-inatomic.s.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

Ralf Baechle 634286f1 732f0462

+4 -7
+1 -4
arch/mips/Kconfig
··· 351 351 select ARC64 352 352 select BOOT_ELF64 353 353 select DEFAULT_SGI_PARTITION 354 - select DMA_IP27 354 + select DMA_COHERENT 355 355 select SYS_HAS_EARLY_PRINTK 356 356 select HW_HAS_PCI 357 357 select NR_CPUS_DEFAULT_64 ··· 759 759 bool 760 760 761 761 config DMA_COHERENT 762 - bool 763 - 764 - config DMA_IP27 765 762 bool 766 763 767 764 config DMA_NONCOHERENT
+1 -1
arch/mips/configs/ip27_defconfig
··· 53 53 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 54 54 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 55 55 CONFIG_ARC=y 56 - CONFIG_DMA_IP27=y 56 + CONFIG_DMA_COHERENT=y 57 57 CONFIG_EARLY_PRINTK=y 58 58 CONFIG_SYS_HAS_EARLY_PRINTK=y 59 59 # CONFIG_NO_IOPORT is not set
+1 -1
arch/mips/lib/memcpy-inatomic.S
··· 21 21 * end of memory on some systems. It's also a seriously bad idea on non 22 22 * dma-coherent systems. 23 23 */ 24 - #if !defined(CONFIG_DMA_COHERENT) || !defined(CONFIG_DMA_IP27) 24 + #ifdef CONFIG_DMA_NONCOHERENT 25 25 #undef CONFIG_CPU_HAS_PREFETCH 26 26 #endif 27 27 #ifdef CONFIG_MIPS_MALTA
+1 -1
arch/mips/lib/memcpy.S
··· 21 21 * end of memory on some systems. It's also a seriously bad idea on non 22 22 * dma-coherent systems. 23 23 */ 24 - #if !defined(CONFIG_DMA_COHERENT) || !defined(CONFIG_DMA_IP27) 24 + #ifdef CONFIG_DMA_NONCOHERENT 25 25 #undef CONFIG_CPU_HAS_PREFETCH 26 26 #endif 27 27 #ifdef CONFIG_MIPS_MALTA