1 files changed, 112 insertions, 74 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index b22c043b6ef8..4fad0a34b997 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -37,16 +37,6 @@ config BASLER_EXCITE
           The eXcite is a smart camera platform manufactured by
           Basler Vision Technologies AG.
 
-config BASLER_EXCITE_PROTOTYPE
-        bool "Support for pre-release units"
-        depends on BASLER_EXCITE
-        default n
-        help
-          Pre-series (prototype) units are different from later ones in
-          some ways. Select this option if you have one of these. Please
-          note that a kernel built with this option selected will not be
-          able to run on normal units.
-
 config BCM47XX
         bool "BCM47XX based boards"
         select CEVT_R4K
@@ -82,7 +72,7 @@ config MIPS_COBALT
         select SYS_HAS_CPU_NEVADA
         select SYS_HAS_EARLY_PRINTK
         select SYS_SUPPORTS_32BIT_KERNEL
-        select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
+        select SYS_SUPPORTS_64BIT_KERNEL
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select GENERIC_HARDIRQS_NO__DO_IRQ
 
@@ -91,6 +81,9 @@ config MACH_DECSTATION
         select BOOT_ELF32
         select CEVT_R4K
         select CSRC_R4K
+        select CPU_DADDI_WORKAROUNDS if 64BIT
+        select CPU_R4000_WORKAROUNDS if 64BIT
+        select CPU_R4400_WORKAROUNDS if 64BIT
         select DMA_NONCOHERENT
         select NO_IOPORT
         select IRQ_CPU
@@ -124,12 +117,12 @@ config MACH_JAZZ
         select ARCH_MAY_HAVE_PC_FDC
         select CEVT_R4K
         select CSRC_R4K
+        select DEFAULT_SGI_PARTITION if CPU_BIG_ENDIAN
         select GENERIC_ISA_DMA
         select IRQ_CPU
         select I8253
         select I8259
         select ISA
-        select PCSPEAKER
         select SYS_HAS_CPU_R4X00
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
@@ -187,6 +180,7 @@ config LEMOTE_FULONG
 config MIPS_ATLAS
         bool "MIPS Atlas board"
         select BOOT_ELF32
+        select BOOT_RAW
         select CEVT_R4K
         select CSRC_R4K
         select DMA_NONCOHERENT
@@ -219,6 +213,7 @@ config MIPS_MALTA
         bool "MIPS Malta board"
         select ARCH_MAY_HAVE_PC_FDC
         select BOOT_ELF32
+        select BOOT_RAW
         select CEVT_R4K
         select CSRC_R4K
         select DMA_NONCOHERENT
@@ -364,35 +359,6 @@ config PMC_YOSEMITE
           Yosemite is an evaluation board for the RM9000x2 processor
           manufactured by PMC-Sierra.
 
-config QEMU
-        bool "Qemu"
-        select CEVT_R4K
-        select CSRC_R4K
-        select DMA_COHERENT
-        select GENERIC_ISA_DMA
-        select HAVE_STD_PC_SERIAL_PORT
-        select I8253
-        select I8259
-        select IRQ_CPU
-        select ISA
-        select PCSPEAKER
-        select SWAP_IO_SPACE
-        select SYS_HAS_CPU_MIPS32_R1
-        select SYS_HAS_EARLY_PRINTK
-        select SYS_SUPPORTS_32BIT_KERNEL
-        select SYS_SUPPORTS_BIG_ENDIAN
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-        select GENERIC_HARDIRQS_NO__DO_IRQ
-        select NR_CPUS_DEFAULT_1
-        select SYS_SUPPORTS_SMP
-        help
-          Qemu is a software emulator which among other architectures also
-          can simulate a MIPS32 4Kc system.  This patch adds support for the
-          system architecture that currently is being simulated by Qemu.  It
-          will eventually be removed again when Qemu has the capability to
-          simulate actual MIPS hardware platforms.  More information on Qemu
-          can be found at http://www.linux-mips.org/wiki/Qemu.
-
 config SGI_IP22
         bool "SGI IP22 (Indy/Indigo2)"
         select ARC
@@ -400,6 +366,7 @@ config SGI_IP22
         select BOOT_ELF32
         select CEVT_R4K
         select CSRC_R4K
+        select DEFAULT_SGI_PARTITION
         select DMA_NONCOHERENT
         select HW_HAS_EISA
         select I8253
@@ -407,6 +374,12 @@ config SGI_IP22
         select IP22_CPU_SCACHE
         select IRQ_CPU
         select GENERIC_ISA_DMA_SUPPORT_BROKEN
+        select SGI_HAS_DS1286
+        select SGI_HAS_I8042
+        select SGI_HAS_INDYDOG
+        select SGI_HAS_SEEQ
+        select SGI_HAS_WD93
+        select SGI_HAS_ZILOG
         select SWAP_IO_SPACE
         select SYS_HAS_CPU_R4X00
         select SYS_HAS_CPU_R5000
@@ -424,6 +397,7 @@ config SGI_IP27
         select ARC
         select ARC64
         select BOOT_ELF64
+        select DEFAULT_SGI_PARTITION
         select DMA_IP27
         select SYS_HAS_EARLY_PRINTK
         select HW_HAS_PCI
@@ -440,6 +414,36 @@ config SGI_IP27
           workstations.  To compile a Linux kernel that runs on these, say Y
           here.
 
+config SGI_IP28
+        bool "SGI IP28 (Indigo2 R10k) (EXPERIMENTAL)"
+        depends on EXPERIMENTAL
+        select ARC
+        select ARC64
+        select BOOT_ELF64
+        select CEVT_R4K
+        select CSRC_R4K
+        select DEFAULT_SGI_PARTITION
+        select DMA_NONCOHERENT
+        select GENERIC_ISA_DMA_SUPPORT_BROKEN
+        select IRQ_CPU
+        select HW_HAS_EISA
+        select I8253
+        select I8259
+        select SGI_HAS_DS1286
+        select SGI_HAS_I8042
+        select SGI_HAS_INDYDOG
+        select SGI_HAS_SEEQ
+        select SGI_HAS_WD93
+        select SGI_HAS_ZILOG
+        select SWAP_IO_SPACE
+        select SYS_HAS_CPU_R10000
+        select SYS_HAS_EARLY_PRINTK
+        select SYS_SUPPORTS_64BIT_KERNEL
+        select SYS_SUPPORTS_BIG_ENDIAN
+      help
+        This is the SGI Indigo2 with R10000 processor.  To compile a Linux
+        kernel that runs on these, say Y here.
+
 config SGI_IP32
         bool "SGI IP32 (O2)"
         select ARC
@@ -545,19 +549,6 @@ config SIBYTE_SENTOSA
         select SYS_SUPPORTS_BIG_ENDIAN
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
-config SIBYTE_PTSWARM
-        bool "Sibyte BCM91250PT-PTSWARM"
-        depends on EXPERIMENTAL
-        select BOOT_ELF32
-        select DMA_COHERENT
-        select NR_CPUS_DEFAULT_2
-        select SIBYTE_SB1250
-        select SWAP_IO_SPACE
-        select SYS_HAS_CPU_SB1
-        select SYS_SUPPORTS_BIG_ENDIAN
-        select SYS_SUPPORTS_HIGHMEM
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-
 config SIBYTE_BIGSUR
         bool "Sibyte BCM91480B-BigSur"
         select BOOT_ELF32
@@ -575,10 +566,12 @@ config SNI_RM
         bool "SNI RM200/300/400"
         select ARC if CPU_LITTLE_ENDIAN
         select ARC32 if CPU_LITTLE_ENDIAN
+        select SNIPROM if CPU_BIG_ENDIAN
         select ARCH_MAY_HAVE_PC_FDC
         select BOOT_ELF32
         select CEVT_R4K
         select CSRC_R4K
+        select DEFAULT_SGI_PARTITION if CPU_BIG_ENDIAN
         select DMA_NONCOHERENT
         select GENERIC_ISA_DMA
         select HW_HAS_EISA
@@ -587,7 +580,6 @@ config SNI_RM
         select I8253
         select I8259
         select ISA
-        select PCSPEAKER
         select SWAP_IO_SPACE if CPU_BIG_ENDIAN
         select SYS_HAS_CPU_R4X00
         select SYS_HAS_CPU_R5000
@@ -690,6 +682,7 @@ config WR_PPMC
 endchoice
 
 source "arch/mips/au1000/Kconfig"
+source "arch/mips/basler/excite/Kconfig"
 source "arch/mips/jazz/Kconfig"
 source "arch/mips/lasat/Kconfig"
 source "arch/mips/pmc-sierra/Kconfig"
@@ -701,6 +694,11 @@ source "arch/mips/vr41xx/Kconfig"
 
 endmenu
 
+config GENERIC_LOCKBREAK
+        bool
+        default y
+        depends on SMP && PREEMPT
+
 config RWSEM_GENERIC_SPINLOCK
         bool
         default y
@@ -797,10 +795,6 @@ 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
@@ -956,16 +950,40 @@ config EMMA2RH
 config SERIAL_RM9000
         bool
 
+config SGI_HAS_DS1286
+        bool
+
+config SGI_HAS_INDYDOG
+        bool
+
+config SGI_HAS_SEEQ
+        bool
+
+config SGI_HAS_WD93
+        bool
+
+config SGI_HAS_ZILOG
+        bool
+
+config SGI_HAS_I8042
+        bool
+
+config DEFAULT_SGI_PARTITION
+        bool
+
 config ARC32
         bool
 
+config SNIPROM
+        bool
+
 config BOOT_ELF32
         bool
 
 config MIPS_L1_CACHE_SHIFT
         int
         default "4" if MACH_DECSTATION
-        default "7" if SGI_IP27 || SNI_RM
+        default "7" if SGI_IP27 || SGI_IP28 || SNI_RM
         default "4" if PMC_MSP4200_EVAL
         default "5"
 
@@ -974,7 +992,7 @@ config HAVE_STD_PC_SERIAL_PORT
 
 config ARC_CONSOLE
         bool "ARC console support"
-        depends on SGI_IP22 || (SNI_RM && CPU_LITTLE_ENDIAN)
+        depends on SGI_IP22 || SGI_IP28 || (SNI_RM && CPU_LITTLE_ENDIAN)
 
 config ARC_MEMORY
         bool
@@ -983,7 +1001,7 @@ config ARC_MEMORY
 
 config ARC_PROMLIB
         bool
-        depends on MACH_JAZZ || SNI_RM || SGI_IP22 || SGI_IP32
+        depends on MACH_JAZZ || SNI_RM || SGI_IP22 || SGI_IP28 || SGI_IP32
         default y
 
 config ARC64
@@ -1443,7 +1461,9 @@ config MIPS_MT_SMP
         select MIPS_MT
         select NR_CPUS_DEFAULT_2
         select SMP
+        select SYS_SUPPORTS_SCHED_SMT if SMP
         select SYS_SUPPORTS_SMP
+        select SMP_UP
         help
           This is a kernel model which is also known a VSMP or lately
           has been marketesed into SMVP.
@@ -1460,6 +1480,7 @@ config MIPS_MT_SMTC
         select NR_CPUS_DEFAULT_8
         select SMP
         select SYS_SUPPORTS_SMP
+        select SMP_UP
         help
           This is a kernel model which is known a SMTC or lately has been
           marketesed into SMVP.
@@ -1469,6 +1490,19 @@ endchoice
 config MIPS_MT
         bool
 
+config SCHED_SMT
+        bool "SMT (multithreading) scheduler support"
+        depends on SYS_SUPPORTS_SCHED_SMT
+        default n
+        help
+          SMT scheduler support improves the CPU scheduler's decision making
+          when dealing with MIPS MT enabled cores at a cost of slightly
+          increased overhead in some places. If unsure say N here.
+
+config SYS_SUPPORTS_SCHED_SMT
+        bool
+
+
 config SYS_SUPPORTS_MULTITHREADING
         bool
 
@@ -1589,15 +1623,6 @@ config CPU_HAS_SMARTMIPS
 config CPU_HAS_WB
         bool
 
-config 64BIT_CONTEXT
-        bool "Save 64bit integer registers"
-        depends on 32BIT && CPU_LOONGSON2
-        help
-          Loongson2 CPU is 64bit , when used in 32BIT mode, its integer
-          registers can still be accessed as 64bit, mainly for multimedia
-          instructions. We must have all 64bit save/restored to make sure
-          those instructions to get correct result.
-
 #
 # Vectored interrupt mode is an R2 feature
 #
@@ -1619,6 +1644,19 @@ config GENERIC_CLOCKEVENTS_BROADCAST
         bool
 
 #
+# CPU non-features
+#
+config CPU_DADDI_WORKAROUNDS
+        bool
+
+config CPU_R4000_WORKAROUNDS
+        bool
+        select CPU_R4400_WORKAROUNDS
+
+config CPU_R4400_WORKAROUNDS
+        bool
+
+#
 # Use the generic interrupt handling code in kernel/irq/:
 #
 config GENERIC_HARDIRQS
@@ -1721,6 +1759,9 @@ config SMP
 
           If you don't know what to do here, say N.
 
+config SMP_UP
+        bool
+
 config SYS_SUPPORTS_SMP
         bool
 
@@ -1978,9 +2019,6 @@ config MMU
 config I8253
         bool
 
-config PCSPEAKER
-        bool
-
 config ZONE_DMA32
         bool