首页 发现 帮助
注册 登录
phyus
/
linux-vybrid_public
8
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

[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: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Ralf Baechle 19 年之前
父节点
42a3b4f25a
当前提交
4ce588cd56
共有 33 个文件被更改，包括 45 次插入 和 6 次删除
合并视图 显示文件统计
  1. 11 3
      arch/mips/Kconfig
  2. 1 0
      arch/mips/configs/atlas_defconfig
  3. 1 0
      arch/mips/configs/capcella_defconfig
  4. 1 0
      arch/mips/configs/cobalt_defconfig
  5. 1 0
      arch/mips/configs/db1000_defconfig
  6. 1 0
      arch/mips/configs/db1100_defconfig
  7. 1 0
      arch/mips/configs/ddb5476_defconfig
  8. 1 0
      arch/mips/configs/ddb5477_defconfig
  9. 1 0
      arch/mips/configs/decstation_defconfig
  10. 1 0
      arch/mips/configs/e55_defconfig
  11. 1 0
      arch/mips/configs/ev64120_defconfig
  12. 1 0
      arch/mips/configs/ev96100_defconfig
  13. 1 0
      arch/mips/configs/ip22_defconfig
  14. 1 0
      arch/mips/configs/ip32_defconfig
  15. 1 0
      arch/mips/configs/it8172_defconfig
  16. 1 0
      arch/mips/configs/ivr_defconfig
  17. 1 0
      arch/mips/configs/jaguar-atx_defconfig
  18. 1 0
      arch/mips/configs/jmr3927_defconfig
  19. 1 0
      arch/mips/configs/lasat200_defconfig
  20. 1 0
      arch/mips/configs/malta_defconfig
  21. 1 0
      arch/mips/configs/mpc30x_defconfig
  22. 1 0
      arch/mips/configs/ocelot_3_defconfig
  23. 1 0
      arch/mips/configs/ocelot_c_defconfig
  24. 1 0
      arch/mips/configs/ocelot_defconfig
  25. 1 0
      arch/mips/configs/ocelot_g_defconfig
  26. 1 0
      arch/mips/configs/pb1100_defconfig
  27. 1 0
      arch/mips/configs/rm200_defconfig
  28. 1 0
      arch/mips/configs/sead_defconfig
  29. 1 0
      arch/mips/configs/tb0226_defconfig
  30. 1 0
      arch/mips/configs/tb0229_defconfig
  31. 1 0
      arch/mips/configs/workpad_defconfig
  32. 1 0
      arch/mips/defconfig
  33. 3 3
      include/asm-mips/pci.h

+ 11 - 3
arch/mips/Kconfig
查看文件 

@@ -951,13 +951,21 @@ config ARC
 
 	depends on SNI_RM200_PCI || SGI_IP32 || SGI_IP27 || SGI_IP22 || MIPS_MAGNUM_4000 || OLIVETTI_M700 || ACER_PICA_61
 
 	depends on SNI_RM200_PCI || SGI_IP32 || SGI_IP27 || SGI_IP22 || MIPS_MAGNUM_4000 || OLIVETTI_M700 || ACER_PICA_61
 
 	default y
 
 	default y
 
 
 
-config	DMA_COHERENT
 
+config DMA_COHERENT
 
 	bool
 
 	bool
 
 
 
-config	DMA_IP27
 
+config DMA_IP27
 
 	bool
 
 	bool
 
 
 
-config	DMA_NONCOHERENT
 
+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
 
 	bool
 
 
 
 config EARLY_PRINTK
 
 config EARLY_PRINTK

+ 1 - 0
arch/mips/configs/atlas_defconfig
查看文件 

@@ -88,6 +88,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_DMA_NONCOHERENT=y
 
 CONFIG_DMA_NONCOHERENT=y
 
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
 
 CONFIG_MIPS_BONITO64=y
 
 CONFIG_MIPS_BONITO64=y
 
 CONFIG_MIPS_MSC=y
 
 CONFIG_MIPS_MSC=y
 
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 
 # CONFIG_CPU_LITTLE_ENDIAN is not set

+ 1 - 0
arch/mips/configs/capcella_defconfig
查看文件 

@@ -97,6 +97,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_DMA_NONCOHERENT=y
 
 CONFIG_DMA_NONCOHERENT=y
 
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 
 CONFIG_MIPS_L1_CACHE_SHIFT=5

+ 1 - 0
arch/mips/configs/cobalt_defconfig
查看文件 

@@ -82,6 +82,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_DMA_NONCOHERENT=y
 
 CONFIG_DMA_NONCOHERENT=y
 
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
 
 CONFIG_I8259=y
 
 CONFIG_I8259=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_IRQ_CPU=y

+ 1 - 0
arch/mips/configs/db1000_defconfig
查看文件 

@@ -104,6 +104,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_DMA_NONCOHERENT=y
 
 CONFIG_DMA_NONCOHERENT=y
 
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 
 CONFIG_MIPS_L1_CACHE_SHIFT=5

+ 1 - 0
arch/mips/configs/db1100_defconfig
查看文件 

@@ -104,6 +104,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_DMA_NONCOHERENT=y
 
 CONFIG_DMA_NONCOHERENT=y
 
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 
 CONFIG_MIPS_L1_CACHE_SHIFT=5

+ 1 - 0
arch/mips/configs/ddb5476_defconfig
查看文件 

@@ -82,6 +82,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_DMA_NONCOHERENT=y
 
 CONFIG_DMA_NONCOHERENT=y
 
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
 
 CONFIG_I8259=y
 
 CONFIG_I8259=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_IRQ_CPU=y

+ 1 - 0
arch/mips/configs/ddb5477_defconfig
查看文件 

@@ -83,6 +83,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_DMA_NONCOHERENT=y
 
 CONFIG_DMA_NONCOHERENT=y
 
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
 
 CONFIG_I8259=y
 
 CONFIG_I8259=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_IRQ_CPU=y

+ 1 - 0
arch/mips/configs/decstation_defconfig
查看文件 

@@ -88,6 +88,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_DMA_NONCOHERENT=y
 
 CONFIG_DMA_NONCOHERENT=y
 
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
 
 CONFIG_EARLY_PRINTK=y
 
 CONFIG_EARLY_PRINTK=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_IRQ_CPU=y

+ 1 - 0
arch/mips/configs/e55_defconfig
查看文件 

@@ -96,6 +96,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_DMA_NONCOHERENT=y
 
 CONFIG_DMA_NONCOHERENT=y
 
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 
 CONFIG_MIPS_L1_CACHE_SHIFT=5

+ 1 - 0
arch/mips/configs/ev64120_defconfig
查看文件 

@@ -89,6 +89,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_DMA_NONCOHERENT=y
 
 CONFIG_DMA_NONCOHERENT=y
 
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
 
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 
 CONFIG_MIPS_GT64120=y
 
 CONFIG_MIPS_GT64120=y
 
 # CONFIG_SYSCLK_75 is not set
 
 # CONFIG_SYSCLK_75 is not set

+ 1 - 0
arch/mips/configs/ev96100_defconfig
查看文件 

@@ -88,6 +88,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_DMA_NONCOHERENT=y
 
 CONFIG_DMA_NONCOHERENT=y
 
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
 
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_MIPS_GT64120=y
 
 CONFIG_MIPS_GT64120=y

+ 1 - 0
arch/mips/configs/ip22_defconfig
查看文件 

@@ -90,6 +90,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_ARC=y
 
 CONFIG_ARC=y
 
 CONFIG_DMA_NONCOHERENT=y
 
 CONFIG_DMA_NONCOHERENT=y
 
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
 
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_SWAP_IO_SPACE=y
 
 CONFIG_SWAP_IO_SPACE=y

+ 1 - 0
arch/mips/configs/ip32_defconfig
查看文件 

@@ -84,6 +84,7 @@ CONFIG_ARC=y
 
 CONFIG_DMA_IP32=y
 
 CONFIG_DMA_IP32=y
 
 CONFIG_OWN_DMA=y
 
 CONFIG_OWN_DMA=y
 
 CONFIG_DMA_NONCOHERENT=y
 
 CONFIG_DMA_NONCOHERENT=y
 
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
 
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 
 CONFIG_ARC32=y
 
 CONFIG_ARC32=y
 
 CONFIG_BOOT_ELF32=y
 
 CONFIG_BOOT_ELF32=y

+ 1 - 0
arch/mips/configs/it8172_defconfig
查看文件 

@@ -90,6 +90,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_DMA_NONCOHERENT=y
 
 CONFIG_DMA_NONCOHERENT=y
 
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_ITE_BOARD_GEN=y
 
 CONFIG_ITE_BOARD_GEN=y
 
 CONFIG_IT8172_CIR=y
 
 CONFIG_IT8172_CIR=y

+ 1 - 0
arch/mips/configs/ivr_defconfig
查看文件 

@@ -89,6 +89,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_DMA_NONCOHERENT=y
 
 CONFIG_DMA_NONCOHERENT=y
 
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_ITE_BOARD_GEN=y
 
 CONFIG_ITE_BOARD_GEN=y
 
 CONFIG_IT8172_CIR=y
 
 CONFIG_IT8172_CIR=y

+ 1 - 0
arch/mips/configs/jaguar-atx_defconfig
查看文件 

@@ -81,6 +81,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_DMA_NONCOHERENT=y
 
 CONFIG_DMA_NONCOHERENT=y
 
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
 
 CONFIG_LIMITED_DMA=y
 
 CONFIG_LIMITED_DMA=y
 
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_IRQ_CPU=y

+ 1 - 0
arch/mips/configs/jmr3927_defconfig
查看文件 

@@ -82,6 +82,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_DMA_NONCOHERENT=y
 
 CONFIG_DMA_NONCOHERENT=y
 
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
 
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 
 CONFIG_MIPS_TX3927=y
 
 CONFIG_MIPS_TX3927=y
 
 CONFIG_SWAP_IO_SPACE=y
 
 CONFIG_SWAP_IO_SPACE=y

+ 1 - 0
arch/mips/configs/lasat200_defconfig
查看文件 

@@ -92,6 +92,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_DMA_NONCOHERENT=y
 
 CONFIG_DMA_NONCOHERENT=y
 
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
 
 CONFIG_MIPS_NILE4=y
 
 CONFIG_MIPS_NILE4=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_MIPS_GT64120=y
 
 CONFIG_MIPS_GT64120=y

+ 1 - 0
arch/mips/configs/malta_defconfig
查看文件 

@@ -88,6 +88,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_DMA_NONCOHERENT=y
 
 CONFIG_DMA_NONCOHERENT=y
 
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
 
 CONFIG_GENERIC_ISA_DMA=y
 
 CONFIG_GENERIC_ISA_DMA=y
 
 CONFIG_I8259=y
 
 CONFIG_I8259=y
 
 CONFIG_MIPS_BONITO64=y
 
 CONFIG_MIPS_BONITO64=y

+ 1 - 0
arch/mips/configs/mpc30x_defconfig
查看文件 

@@ -97,6 +97,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_DMA_NONCOHERENT=y
 
 CONFIG_DMA_NONCOHERENT=y
 
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 
 CONFIG_MIPS_L1_CACHE_SHIFT=5

+ 1 - 0
arch/mips/configs/ocelot_3_defconfig
查看文件 

@@ -89,6 +89,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_DMA_NONCOHERENT=y
 
 CONFIG_DMA_NONCOHERENT=y
 
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
 
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_IRQ_CPU_RM7K=y
 
 CONFIG_IRQ_CPU_RM7K=y

+ 1 - 0
arch/mips/configs/ocelot_c_defconfig
查看文件 

@@ -80,6 +80,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_DMA_NONCOHERENT=y
 
 CONFIG_DMA_NONCOHERENT=y
 
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
 
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_IRQ_MV64340=y
 
 CONFIG_IRQ_MV64340=y

+ 1 - 0
arch/mips/configs/ocelot_defconfig
查看文件 

@@ -82,6 +82,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_DMA_NONCOHERENT=y
 
 CONFIG_DMA_NONCOHERENT=y
 
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
 
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_IRQ_CPU_RM7K=y
 
 CONFIG_IRQ_CPU_RM7K=y

+ 1 - 0
arch/mips/configs/ocelot_g_defconfig
查看文件 

@@ -80,6 +80,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_DMA_NONCOHERENT=y
 
 CONFIG_DMA_NONCOHERENT=y
 
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
 
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_IRQ_CPU_RM7K=y
 
 CONFIG_IRQ_CPU_RM7K=y

+ 1 - 0
arch/mips/configs/pb1100_defconfig
查看文件 

@@ -104,6 +104,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_DMA_NONCOHERENT=y
 
 CONFIG_DMA_NONCOHERENT=y
 
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_SWAP_IO_SPACE=y
 
 CONFIG_SWAP_IO_SPACE=y
 
 # CONFIG_AU1X00_USB_DEVICE is not set
 
 # CONFIG_AU1X00_USB_DEVICE is not set

+ 1 - 0
arch/mips/configs/rm200_defconfig
查看文件 

@@ -91,6 +91,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_ARC=y
 
 CONFIG_ARC=y
 
 CONFIG_DMA_NONCOHERENT=y
 
 CONFIG_DMA_NONCOHERENT=y
 
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
 
 CONFIG_GENERIC_ISA_DMA=y
 
 CONFIG_GENERIC_ISA_DMA=y
 
 CONFIG_I8259=y
 
 CONFIG_I8259=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y

+ 1 - 0
arch/mips/configs/sead_defconfig
查看文件 

@@ -80,6 +80,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_DMA_NONCOHERENT=y
 
 CONFIG_DMA_NONCOHERENT=y
 
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_MIPS_BOARDS_GEN=y
 
 CONFIG_MIPS_BOARDS_GEN=y

+ 1 - 0
arch/mips/configs/tb0226_defconfig
查看文件 

@@ -95,6 +95,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_DMA_NONCOHERENT=y
 
 CONFIG_DMA_NONCOHERENT=y
 
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 
 CONFIG_MIPS_L1_CACHE_SHIFT=5

+ 1 - 0
arch/mips/configs/tb0229_defconfig
查看文件 

@@ -98,6 +98,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_DMA_NONCOHERENT=y
 
 CONFIG_DMA_NONCOHERENT=y
 
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 
 CONFIG_MIPS_L1_CACHE_SHIFT=5

+ 1 - 0
arch/mips/configs/workpad_defconfig
查看文件 

@@ -96,6 +96,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_DMA_NONCOHERENT=y
 
 CONFIG_DMA_NONCOHERENT=y
 
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 
 CONFIG_MIPS_L1_CACHE_SHIFT=5

+ 1 - 0
arch/mips/defconfig
查看文件 

@@ -90,6 +90,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_HAVE_DEC_LOCK=y
 
 CONFIG_ARC=y
 
 CONFIG_ARC=y
 
 CONFIG_DMA_NONCOHERENT=y
 
 CONFIG_DMA_NONCOHERENT=y
 
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
 
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_IRQ_CPU=y
 
 CONFIG_SWAP_IO_SPACE=y
 
 CONFIG_SWAP_IO_SPACE=y

+ 3 - 3
include/asm-mips/pci.h
查看文件 

@@ -94,7 +94,7 @@ struct pci_dev;
 
  */
 
  */
 
 extern unsigned int PCI_DMA_BUS_IS_PHYS;
 
 extern unsigned int PCI_DMA_BUS_IS_PHYS;
 
 
 
-#ifdef CONFIG_MAPPED_DMA_IO
 
+#ifdef CONFIG_DMA_NEED_PCI_MAP_STATE
 
 
 
 /* pci_unmap_{single,page} is not a nop, thus... */
 
 /* pci_unmap_{single,page} is not a nop, thus... */
 
 #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)	dma_addr_t ADDR_NAME;
 
 #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)	dma_addr_t ADDR_NAME;
 
@@ -104,7 +104,7 @@ extern unsigned int PCI_DMA_BUS_IS_PHYS;
 
 #define pci_unmap_len(PTR, LEN_NAME)		((PTR)->LEN_NAME)
 
 #define pci_unmap_len(PTR, LEN_NAME)		((PTR)->LEN_NAME)
 
 #define pci_unmap_len_set(PTR, LEN_NAME, VAL)	(((PTR)->LEN_NAME) = (VAL))
 
 #define pci_unmap_len_set(PTR, LEN_NAME, VAL)	(((PTR)->LEN_NAME) = (VAL))
 
 
 
-#else /* CONFIG_MAPPED_DMA_IO  */
 
+#else /* CONFIG_DMA_NEED_PCI_MAP_STATE  */
 
 
 
 /* pci_unmap_{page,single} is a nop so... */
 
 /* pci_unmap_{page,single} is a nop so... */
 
 #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)
 
 #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)
 
@@ -114,7 +114,7 @@ extern unsigned int PCI_DMA_BUS_IS_PHYS;
 
 #define pci_unmap_len(PTR, LEN_NAME)		(0)
 
 #define pci_unmap_len(PTR, LEN_NAME)		(0)
 
 #define pci_unmap_len_set(PTR, LEN_NAME, VAL)	do { } while (0)
 
 #define pci_unmap_len_set(PTR, LEN_NAME, VAL)	do { } while (0)
 
 
 
-#endif /* CONFIG_MAPPED_DMA_IO  */
 
+#endif /* CONFIG_DMA_NEED_PCI_MAP_STATE  */
 
 
 
 /* This is always fine. */
 
 /* This is always fine. */
 
 #define pci_dac_dma_supported(pci_dev, mask)	(1)
 
 #define pci_dac_dma_supported(pci_dev, mask)	(1)