powerpc/cell: Add DMA_ATTR_WEAK_ORDERING dma attribute and use in Cell IOMMU code

[safe/jmp/linux-2.6] / arch / powerpc / platforms / Kconfig.cputype

diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index f6bf025..7f65127 100644 (file)
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -14,7 +14,7 @@ choice
          There are five families of 32 bit PowerPC chips supported.
          The most common ones are the desktop and server CPUs (601, 603,
          604, 740, 750, 74xx) CPUs from Freescale and IBM, with their
-         embedded 52xx/82xx/83xx/86xx counterparts.
+         embedded 512x/52xx/82xx/83xx/86xx counterparts.
          The other embeeded parts, namely 4xx, 8xx, e200 (55xx) and e500
          (85xx) each form a family of their own that is not compatible
          with the others.
@@ -22,34 +22,34 @@ choice
          If unsure, select 52xx/6xx/7xx/74xx/82xx/83xx/86xx.
 
 config 6xx
-       bool "52xx/6xx/7xx/74xx/82xx/83xx/86xx"
+       bool "512x/52xx/6xx/7xx/74xx/82xx/83xx/86xx"
        select PPC_FPU
 
 config PPC_85xx
        bool "Freescale 85xx"
        select E500
        select FSL_SOC
-       select WANT_DEVICE_TREE
        select MPC85xx
 
 config PPC_8xx
        bool "Freescale 8xx"
        select FSL_SOC
        select 8xx
-       select WANT_DEVICE_TREE
        select PPC_LIB_RHEAP
 
 config 40x
        bool "AMCC 40x"
        select PPC_DCR_NATIVE
-       select WANT_DEVICE_TREE
        select PPC_UDBG_16550
+       select 4xx_SOC
+       select PPC_PCI_CHOICE
 
 config 44x
        bool "AMCC 44x"
        select PPC_DCR_NATIVE
-       select WANT_DEVICE_TREE
        select PPC_UDBG_16550
+       select 4xx_SOC
+       select PPC_PCI_CHOICE
 
 config E200
        bool "Freescale e200"
@@ -86,20 +86,19 @@ config TUNE_CELL
          machines. When building a kernel that is supposed to run only
          on Cell, you should also select the POWER4_ONLY option.
 
-config 6xx
-       bool
-
 # this is temp to handle compat with arch=ppc
 config 8xx
        bool
 
-# this is temp to handle compat with arch=ppc
-config 83xx
-       bool
-
 config E500
+       select FSL_EMB_PERFMON
        bool
 
+config PPC_E500MC
+       bool "e500mc Support"
+       select PPC_FPU
+       depends on E500
+
 config PPC_FPU
        bool
        default y if PPC64
@@ -119,6 +118,14 @@ config FSL_BOOKE
        depends on E200 || E500
        default y
 
+config FSL_EMB_PERFMON
+       bool "Freescale Embedded Perfmon"
+       depends on E500 || PPC_83xx
+       help
+         This is the Performance Monitor support found on the e500 core
+         and some e300 cores (c3 and c4).  Select this only if your
+         core supports the Embedded Performance Monitor APU
+
 config PTE_64BIT
        bool
        depends on 44x || E500
@@ -152,9 +159,25 @@ config ALTIVEC
 
          If in doubt, say Y here.
 
+config VSX
+       bool "VSX Support"
+       depends on POWER4 && ALTIVEC && PPC_FPU
+       ---help---
+
+         This option enables kernel support for the Vector Scaler extensions
+         to the PowerPC processor. The kernel currently supports saving and
+         restoring VSX registers, and turning on the 'VSX enable' bit so user
+         processes can execute VSX instructions.
+
+         This option is only useful if you have a processor that supports
+         VSX (P7 and above), but does not have any affect on a non-VSX
+         CPUs (it does, however add code to the kernel).
+
+         If in doubt, say Y here.
+
 config SPE
        bool "SPE Support"
-       depends on E200 || E500
+       depends on E200 || (E500 && !PPC_E500MC)
        default y
        ---help---
          This option enables kernel support for the Signal Processing
@@ -179,7 +202,7 @@ config PPC_STD_MMU_32
 
 config PPC_MM_SLICES
        bool
-       default y if HUGETLB_PAGE
+       default y if HUGETLB_PAGE || PPC_64K_PAGES
        default n
 
 config VIRT_CPU_ACCOUNTING
@@ -217,15 +240,15 @@ config SMP
          If you don't know what to do here, say N.
 
 config NR_CPUS
-       int "Maximum number of CPUs (2-128)"
-       range 2 128
+       int "Maximum number of CPUs (2-1024)"
+       range 2 1024
        depends on SMP
        default "32" if PPC64
        default "4"
 
 config NOT_COHERENT_CACHE
        bool
-       depends on 4xx || 8xx || E200
+       depends on 4xx || 8xx || E200 || PPC_MPC512x
        default y
 
 config CHECK_CACHE_COHERENCY