Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 634286f127bef8799cd04799d3e1d5471e8fd91c

Authored by Ralf Baechle
1 parent 732f0462d5
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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>

Showing 4 changed files with 4 additions and 7 deletions Side-by-side Diff

... ... @@ -351,7 +351,7 @@
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,9 +759,6 @@
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
arch/mips/configs/ip27_defconfig
Diff comments   View file @ 634286f
... ... @@ -53,7 +53,7 @@
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
arch/mips/lib/memcpy-inatomic.S
Diff comments   View file @ 634286f
... ... @@ -21,7 +21,7 @@
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
arch/mips/lib/memcpy.S
Diff comments   View file @ 634286f
... ... @@ -21,7 +21,7 @@
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