Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ce588cd authored by Ralf Baechle's avatar Ralf Baechle Committed by Linus Torvalds
Browse files

[PATCH] mips: fix coherency configuration 



Fix the MIPS coherency configuration such that we always keep the mapping
state in <asm/pci.h> when we need to on non-coherent platforms.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 42a3b4f2

arch/mips/Kconfig

+11 −3
Original line number Diff line number Diff line
@@ -957,8 +957,16 @@ config DMA_COHERENT 
config DMA_IP27

	bool



config DMA_IP32

	bool

	select DMA_NEED_PCI_MAP_STATE



config DMA_NONCOHERENT

	bool

	select DMA_NEED_PCI_MAP_STATE



config DMA_NEED_PCI_MAP_STATE

	bool



config EARLY_PRINTK

	bool

arch/mips/configs/atlas_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y 
CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_HAVE_DEC_LOCK=y

CONFIG_DMA_NONCOHERENT=y

CONFIG_DMA_NEED_PCI_MAP_STATE=y

CONFIG_MIPS_BONITO64=y

CONFIG_MIPS_MSC=y

# CONFIG_CPU_LITTLE_ENDIAN is not set

arch/mips/configs/capcella_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y 
CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_HAVE_DEC_LOCK=y

CONFIG_DMA_NONCOHERENT=y

CONFIG_DMA_NEED_PCI_MAP_STATE=y

CONFIG_CPU_LITTLE_ENDIAN=y

CONFIG_IRQ_CPU=y

CONFIG_MIPS_L1_CACHE_SHIFT=5

arch/mips/configs/cobalt_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y 
CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_HAVE_DEC_LOCK=y

CONFIG_DMA_NONCOHERENT=y

CONFIG_DMA_NEED_PCI_MAP_STATE=y

CONFIG_I8259=y

CONFIG_CPU_LITTLE_ENDIAN=y

CONFIG_IRQ_CPU=y

arch/mips/configs/db1000_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y 
CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_HAVE_DEC_LOCK=y

CONFIG_DMA_NONCOHERENT=y

CONFIG_DMA_NEED_PCI_MAP_STATE=y

CONFIG_CPU_LITTLE_ENDIAN=y

CONFIG_MIPS_L1_CACHE_SHIFT=5