Эхлэл Бүгдийг харах Тусламж
Нэвтрэх
GfA
/
linux_kernel
5
0
Салаа 0
Файлууд Асуудлууд 0 Хуулах хүсэлтүүд 0 Мэдлэгийн сан
Эх сурвалжийг харах

MIPS: remove CONFIG_DMA_COHERENT

We can just check for !CONFIG_DMA_NONCOHERENT instead and simplify things
a lot.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Paul Burton <paul.burton@mips.com>
Patchwork: https://patchwork.linux-mips.org/patch/19530/
Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: David Daney <david.daney@cavium.com>
Cc: Kevin Cernekee <cernekee@gmail.com>
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
Cc: Tom Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Huacai Chen <chenhc@lemote.com>
Cc: iommu@lists.linux-foundation.org
Cc: linux-mips@linux-mips.org
Christoph Hellwig 7 жил өмнө
parent
972dc3b79f
commit
7e4dbdc112
5 өөрчлөгдсөн 6 нэмэгдсэн , 24 устгасан
Өөрчлөллтийг нэгтгэж харах Өөрчлөлтийн статистик харах
  1. 0 16
      arch/mips/Kconfig
  2. 3 3
      arch/mips/include/asm/dma-coherence.h
  3. 1 2
      arch/mips/include/asm/mach-generic/kmalloc.h
  4. 2 2
      arch/mips/mti-malta/malta-setup.c
  5. 0 1
      arch/mips/sibyte/Kconfig

+ 0 - 16
arch/mips/Kconfig
Файл харах 

@@ -666,7 +666,6 @@ config SGI_IP27
 
 	select FW_ARC64
 
 	select FW_ARC64
 
 	select BOOT_ELF64
 
 	select BOOT_ELF64
 
 	select DEFAULT_SGI_PARTITION
 
 	select DEFAULT_SGI_PARTITION
 
-	select DMA_COHERENT
 
 	select SYS_HAS_EARLY_PRINTK
 
 	select SYS_HAS_EARLY_PRINTK
 
 	select HW_HAS_PCI
 
 	select HW_HAS_PCI
 
 	select NR_CPUS_DEFAULT_64
 
 	select NR_CPUS_DEFAULT_64
 
@@ -743,7 +742,6 @@ config SGI_IP32
 
 config SIBYTE_CRHINE
 
 config SIBYTE_CRHINE
 
 	bool "Sibyte BCM91120C-CRhine"
 
 	bool "Sibyte BCM91120C-CRhine"
 
 	select BOOT_ELF32
 
 	select BOOT_ELF32
 
-	select DMA_COHERENT
 
 	select SIBYTE_BCM1120
 
 	select SIBYTE_BCM1120
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
 	select SYS_HAS_CPU_SB1
 
 	select SYS_HAS_CPU_SB1
 
@@ -753,7 +751,6 @@ config SIBYTE_CRHINE
 
 config SIBYTE_CARMEL
 
 config SIBYTE_CARMEL
 
 	bool "Sibyte BCM91120x-Carmel"
 
 	bool "Sibyte BCM91120x-Carmel"
 
 	select BOOT_ELF32
 
 	select BOOT_ELF32
 
-	select DMA_COHERENT
 
 	select SIBYTE_BCM1120
 
 	select SIBYTE_BCM1120
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
 	select SYS_HAS_CPU_SB1
 
 	select SYS_HAS_CPU_SB1
 
@@ -763,7 +760,6 @@ config SIBYTE_CARMEL
 
 config SIBYTE_CRHONE
 
 config SIBYTE_CRHONE
 
 	bool "Sibyte BCM91125C-CRhone"
 
 	bool "Sibyte BCM91125C-CRhone"
 
 	select BOOT_ELF32
 
 	select BOOT_ELF32
 
-	select DMA_COHERENT
 
 	select SIBYTE_BCM1125
 
 	select SIBYTE_BCM1125
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
 	select SYS_HAS_CPU_SB1
 
 	select SYS_HAS_CPU_SB1
 
@@ -774,7 +770,6 @@ config SIBYTE_CRHONE
 
 config SIBYTE_RHONE
 
 config SIBYTE_RHONE
 
 	bool "Sibyte BCM91125E-Rhone"
 
 	bool "Sibyte BCM91125E-Rhone"
 
 	select BOOT_ELF32
 
 	select BOOT_ELF32
 
-	select DMA_COHERENT
 
 	select SIBYTE_BCM1125H
 
 	select SIBYTE_BCM1125H
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
 	select SYS_HAS_CPU_SB1
 
 	select SYS_HAS_CPU_SB1
 
@@ -784,7 +779,6 @@ config SIBYTE_RHONE
 
 config SIBYTE_SWARM
 
 config SIBYTE_SWARM
 
 	bool "Sibyte BCM91250A-SWARM"
 
 	bool "Sibyte BCM91250A-SWARM"
 
 	select BOOT_ELF32
 
 	select BOOT_ELF32
 
-	select DMA_COHERENT
 
 	select HAVE_PATA_PLATFORM
 
 	select HAVE_PATA_PLATFORM
 
 	select SIBYTE_SB1250
 
 	select SIBYTE_SB1250
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
@@ -797,7 +791,6 @@ config SIBYTE_SWARM
 
 config SIBYTE_LITTLESUR
 
 config SIBYTE_LITTLESUR
 
 	bool "Sibyte BCM91250C2-LittleSur"
 
 	bool "Sibyte BCM91250C2-LittleSur"
 
 	select BOOT_ELF32
 
 	select BOOT_ELF32
 
-	select DMA_COHERENT
 
 	select HAVE_PATA_PLATFORM
 
 	select HAVE_PATA_PLATFORM
 
 	select SIBYTE_SB1250
 
 	select SIBYTE_SB1250
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
@@ -809,7 +802,6 @@ config SIBYTE_LITTLESUR
 
 config SIBYTE_SENTOSA
 
 config SIBYTE_SENTOSA
 
 	bool "Sibyte BCM91250E-Sentosa"
 
 	bool "Sibyte BCM91250E-Sentosa"
 
 	select BOOT_ELF32
 
 	select BOOT_ELF32
 
-	select DMA_COHERENT
 
 	select SIBYTE_SB1250
 
 	select SIBYTE_SB1250
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
 	select SYS_HAS_CPU_SB1
 
 	select SYS_HAS_CPU_SB1
 
@@ -819,7 +811,6 @@ config SIBYTE_SENTOSA
 
 config SIBYTE_BIGSUR
 
 config SIBYTE_BIGSUR
 
 	bool "Sibyte BCM91480B-BigSur"
 
 	bool "Sibyte BCM91480B-BigSur"
 
 	select BOOT_ELF32
 
 	select BOOT_ELF32
 
-	select DMA_COHERENT
 
 	select NR_CPUS_DEFAULT_4
 
 	select NR_CPUS_DEFAULT_4
 
 	select SIBYTE_BCM1x80
 
 	select SIBYTE_BCM1x80
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
@@ -896,7 +887,6 @@ config CAVIUM_OCTEON_SOC
 
 	select CEVT_R4K
 
 	select CEVT_R4K
 
 	select ARCH_HAS_PHYS_TO_DMA
 
 	select ARCH_HAS_PHYS_TO_DMA
 
 	select PHYS_ADDR_T_64BIT
 
 	select PHYS_ADDR_T_64BIT
 
-	select DMA_COHERENT
 
 	select SYS_SUPPORTS_64BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select EDAC_SUPPORT
 
 	select EDAC_SUPPORT
 
@@ -945,7 +935,6 @@ config NLM_XLR_BOARD
 
 	select PHYS_ADDR_T_64BIT
 
 	select PHYS_ADDR_T_64BIT
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_HIGHMEM
 
 	select SYS_SUPPORTS_HIGHMEM
 
-	select DMA_COHERENT
 
 	select NR_CPUS_DEFAULT_32
 
 	select NR_CPUS_DEFAULT_32
 
 	select CEVT_R4K
 
 	select CEVT_R4K
 
 	select CSRC_R4K
 
 	select CSRC_R4K
 
@@ -973,7 +962,6 @@ config NLM_XLP_BOARD
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_HIGHMEM
 
 	select SYS_SUPPORTS_HIGHMEM
 
-	select DMA_COHERENT
 
 	select NR_CPUS_DEFAULT_32
 
 	select NR_CPUS_DEFAULT_32
 
 	select CEVT_R4K
 
 	select CEVT_R4K
 
 	select CSRC_R4K
 
 	select CSRC_R4K
 
@@ -992,7 +980,6 @@ config MIPS_PARAVIRT
 
 	bool "Para-Virtualized guest system"
 
 	bool "Para-Virtualized guest system"
 
 	select CEVT_R4K
 
 	select CEVT_R4K
 
 	select CSRC_R4K
 
 	select CSRC_R4K
 
-	select DMA_COHERENT
 
 	select SYS_SUPPORTS_64BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
@@ -1118,9 +1105,6 @@ config DMA_PERDEV_COHERENT
 
 	bool
 
 	bool
 
 	select DMA_MAYBE_COHERENT
 
 	select DMA_MAYBE_COHERENT
 
 
 
-config DMA_COHERENT
 
-	bool
 
-
 
 config DMA_NONCOHERENT
 
 config DMA_NONCOHERENT
 
 	bool
 
 	bool
 
 	select NEED_DMA_MAP_STATE
 
 	select NEED_DMA_MAP_STATE

+ 3 - 3
arch/mips/include/asm/dma-coherence.h
Файл харах 

@@ -21,10 +21,10 @@ enum coherent_io_user_state {
 
 extern enum coherent_io_user_state coherentio;
 
 extern enum coherent_io_user_state coherentio;
 
 extern int hw_coherentio;
 
 extern int hw_coherentio;
 
 #else
 
 #else
 
-#ifdef CONFIG_DMA_COHERENT
 
-#define coherentio	IO_COHERENCE_ENABLED
 
-#else
 
+#ifdef CONFIG_DMA_NONCOHERENT
 
 #define coherentio	IO_COHERENCE_DISABLED
 
 #define coherentio	IO_COHERENCE_DISABLED
 
+#else
 
+#define coherentio	IO_COHERENCE_ENABLED
 
 #endif
 
 #endif
 
 #define hw_coherentio	0
 
 #define hw_coherentio	0
 
 #endif /* CONFIG_DMA_MAYBE_COHERENT */
 
 #endif /* CONFIG_DMA_MAYBE_COHERENT */

+ 1 - 2
arch/mips/include/asm/mach-generic/kmalloc.h
Файл харах 

@@ -2,8 +2,7 @@
 
 #ifndef __ASM_MACH_GENERIC_KMALLOC_H
 
 #ifndef __ASM_MACH_GENERIC_KMALLOC_H
 
 #define __ASM_MACH_GENERIC_KMALLOC_H
 
 #define __ASM_MACH_GENERIC_KMALLOC_H
 
 
 
-
 
-#ifndef CONFIG_DMA_COHERENT
 
+#ifdef CONFIG_DMA_NONCOHERENT
 
 /*
 
 /*
 
  * Total overkill for most systems but need as a safe default.
 
  * Total overkill for most systems but need as a safe default.
 
  * Set this one if any device in the system might do non-coherent DMA.
 
  * Set this one if any device in the system might do non-coherent DMA.

+ 2 - 2
arch/mips/mti-malta/malta-setup.c
Файл харах 

@@ -227,7 +227,7 @@ static void __init bonito_quirks_setup(void)
 
 	} else
 
 	} else
 
 		BONITO_BONGENCFG &= ~BONITO_BONGENCFG_DEBUGMODE;
 
 		BONITO_BONGENCFG &= ~BONITO_BONGENCFG_DEBUGMODE;
 
 
 
-#ifdef CONFIG_DMA_COHERENT
 
+#ifndef CONFIG_DMA_NONCOHERENT
 
 	if (BONITO_PCICACHECTRL & BONITO_PCICACHECTRL_CPUCOH_PRES) {
 
 	if (BONITO_PCICACHECTRL & BONITO_PCICACHECTRL_CPUCOH_PRES) {
 
 		BONITO_PCICACHECTRL |= BONITO_PCICACHECTRL_CPUCOH_EN;
 
 		BONITO_PCICACHECTRL |= BONITO_PCICACHECTRL_CPUCOH_EN;
 
 		pr_info("Enabled Bonito CPU coherency\n");
 
 		pr_info("Enabled Bonito CPU coherency\n");
 
@@ -279,7 +279,7 @@ void __init plat_mem_setup(void)
 
 	 */
 
 	 */
 
 	enable_dma(4);
 
 	enable_dma(4);
 
 
 
-#ifdef CONFIG_DMA_COHERENT
 
+#ifndef CONFIG_DMA_NONCOHERENT
 
 	if (mips_revision_sconid != MIPS_REVISION_SCON_BONITO)
 
 	if (mips_revision_sconid != MIPS_REVISION_SCON_BONITO)
 
 		panic("Hardware DMA cache coherency not supported");
 
 		panic("Hardware DMA cache coherency not supported");
 
 #endif
 
 #endif

+ 0 - 1
arch/mips/sibyte/Kconfig
Файл харах 

@@ -70,7 +70,6 @@ config SIBYTE_BCM1x55
 
 
 
 config SIBYTE_SB1xxx_SOC
 
 config SIBYTE_SB1xxx_SOC
 
 	bool
 
 	bool
 
-	select DMA_COHERENT
 
 	select IRQ_MIPS_CPU
 
 	select IRQ_MIPS_CPU
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_32BIT_KERNEL