Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

Pull MIPS updates from Ralf Baechle:
 "The MIPS bits for 3.8.  This also includes a bunch fixes that were
  sitting in the linux-mips.org git tree for a long time.  This pull
  request contains updates to several OCTEON drivers and the board
  support code for BCM47XX, BCM63XX, XLP, XLR, XLS, lantiq, Loongson1B,
  updates to the SSB bus support, MIPS kexec code and adds support for
  kdump.

  When pulling this, there are two expected merge conflicts in
  include/linux/bcma/bcma_driver_chipcommon.h which are trivial to
  resolve, just remove the conflict markers and keep both alternatives."

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (90 commits)
  MIPS: PMC-Sierra Yosemite: Remove support.
  VIDEO: Newport Fix console crashes
  MIPS: wrppmc: Fix build of PCI code.
  MIPS: IP22/IP28: Fix build of EISA code.
  MIPS: RB532: Fix build of prom code.
  MIPS: PowerTV: Fix build.
  MIPS: IP27: Correct fucked grammar in ops-bridge.c
  MIPS: Highmem: Fix build error if CONFIG_DEBUG_HIGHMEM is disabled
  MIPS: Fix potencial corruption
  MIPS: Fix for warning from FPU emulation code
  MIPS: Handle COP3 Unusable exception as COP1X for FP emulation
  MIPS: Fix poweroff failure when HOTPLUG_CPU configured.
  MIPS: MT: Fix build with CONFIG_UIDGID_STRICT_TYPE_CHECKS=y
  MIPS: Remove unused smvp.h
  MIPS/EDAC: Improve OCTEON EDAC support.
  MIPS: OCTEON: Add definitions for OCTEON memory contoller registers.
  MIPS: OCTEON: Add OCTEON family definitions to octeon-model.h
  ata: pata_octeon_cf: Use correct byte order for DMA in when built little-endian.
  MIPS/OCTEON/ata: Convert pata_octeon_cf.c to use device tree.
  MIPS: Remove usage of CEVT_R4K_LIB config option.
  ...

1 files changed, 65 insertions, 76 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 4183e62f178c..d971d1586f1c 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -19,6 +19,7 @@ config MIPS
         select HAVE_KRETPROBES
         select HAVE_DEBUG_KMEMLEAK
         select ARCH_BINFMT_ELF_RANDOMIZE_PIE
+        select HAVE_ARCH_TRANSPARENT_HUGEPAGE
         select RTC_LIB if !MACH_LOONGSON
         select GENERIC_ATOMIC64 if !64BIT
         select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
@@ -55,8 +56,8 @@ choice
 config MIPS_ALCHEMY
         bool "Alchemy processor based machines"
         select 64BIT_PHYS_ADDR
-        select CEVT_R4K_LIB
-        select CSRC_R4K_LIB
+        select CEVT_R4K
+        select CSRC_R4K
         select IRQ_CPU
         select SYS_HAS_CPU_MIPS32_R1
         select SYS_SUPPORTS_32BIT_KERNEL
@@ -107,16 +108,16 @@ config ATH79
 
 config BCM47XX
         bool "Broadcom BCM47XX based boards"
+        select ARCH_WANT_OPTIONAL_GPIOLIB
         select CEVT_R4K
         select CSRC_R4K
         select DMA_NONCOHERENT
+        select FW_CFE
         select HW_HAS_PCI
         select IRQ_CPU
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_LITTLE_ENDIAN
-        select GENERIC_GPIO
         select SYS_HAS_EARLY_PRINTK
-        select CFE
         help
          Support for BCM47XX based boards
 
@@ -193,8 +194,8 @@ config MACH_DECSTATION
 
 config MACH_JAZZ
         bool "Jazz family of machines"
-        select ARC
-        select ARC32
+        select FW_ARC
+        select FW_ARC32
         select ARCH_MAY_HAVE_PC_FDC
         select CEVT_R4K
         select CSRC_R4K
@@ -417,27 +418,6 @@ config PMC_MSP
           of integrated peripherals, interfaces and DSPs in addition to
           a variety of MIPS cores.
 
-config PMC_YOSEMITE
-        bool "PMC-Sierra Yosemite eval board"
-        select CEVT_R4K
-        select CSRC_R4K
-        select DMA_COHERENT
-        select HW_HAS_PCI
-        select IRQ_CPU
-        select IRQ_CPU_RM7K
-        select IRQ_CPU_RM9K
-        select SWAP_IO_SPACE
-        select SYS_HAS_CPU_RM9000
-        select SYS_HAS_EARLY_PRINTK
-        select SYS_SUPPORTS_32BIT_KERNEL
-        select SYS_SUPPORTS_64BIT_KERNEL
-        select SYS_SUPPORTS_BIG_ENDIAN
-        select SYS_SUPPORTS_HIGHMEM
-        select SYS_SUPPORTS_SMP
-        help
-          Yosemite is an evaluation board for the RM9000x2 processor
-          manufactured by PMC-Sierra.
-
 config POWERTV
         bool "Cisco PowerTV"
         select BOOT_ELF32
@@ -458,8 +438,8 @@ config POWERTV
 
 config SGI_IP22
         bool "SGI IP22 (Indy/Indigo2)"
-        select ARC
-        select ARC32
+        select FW_ARC
+        select FW_ARC32
         select BOOT_ELF32
         select CEVT_R4K
         select CSRC_R4K
@@ -498,8 +478,8 @@ config SGI_IP22
 
 config SGI_IP27
         bool "SGI IP27 (Origin200/2000)"
-        select ARC
-        select ARC64
+        select FW_ARC
+        select FW_ARC64
         select BOOT_ELF64
         select DEFAULT_SGI_PARTITION
         select DMA_COHERENT
@@ -519,8 +499,8 @@ config SGI_IP27
 config SGI_IP28
         bool "SGI IP28 (Indigo2 R10k) (EXPERIMENTAL)"
         depends on EXPERIMENTAL
-        select ARC
-        select ARC64
+        select FW_ARC
+        select FW_ARC64
         select BOOT_ELF64
         select CEVT_R4K
         select CSRC_R4K
@@ -555,8 +535,8 @@ config SGI_IP28
 
 config SGI_IP32
         bool "SGI IP32 (O2)"
-        select ARC
-        select ARC32
+        select FW_ARC
+        select FW_ARC32
         select BOOT_ELF32
         select CEVT_R4K
         select CSRC_R4K
@@ -674,8 +654,8 @@ config SIBYTE_BIGSUR
 
 config SNI_RM
         bool "SNI RM200/300/400"
-        select ARC if CPU_LITTLE_ENDIAN
-        select ARC32 if CPU_LITTLE_ENDIAN
+        select FW_ARC if CPU_LITTLE_ENDIAN
+        select FW_ARC32 if CPU_LITTLE_ENDIAN
         select SNIPROM if CPU_BIG_ENDIAN
         select ARCH_MAY_HAVE_PC_FDC
         select BOOT_ELF32
@@ -776,6 +756,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
         select DMA_COHERENT
         select SYS_SUPPORTS_64BIT_KERNEL
         select SYS_SUPPORTS_BIG_ENDIAN
+        select EDAC_SUPPORT
         select SYS_SUPPORTS_HOTPLUG_CPU
         select SYS_HAS_EARLY_PRINTK
         select SYS_HAS_CPU_CAVIUM_OCTEON
@@ -819,7 +800,7 @@ config NLM_XLR_BOARD
         select CSRC_R4K
         select IRQ_CPU
         select ARCH_SUPPORTS_MSI
-        select ZONE_DMA if 64BIT
+        select ZONE_DMA32 if 64BIT
         select SYNC_R4K
         select SYS_HAS_EARLY_PRINTK
         select USB_ARCH_HAS_OHCI if USB_SUPPORT
@@ -847,7 +828,7 @@ config NLM_XLP_BOARD
         select CEVT_R4K
         select CSRC_R4K
         select IRQ_CPU
-        select ZONE_DMA if 64BIT
+        select ZONE_DMA32 if 64BIT
         select SYNC_R4K
         select SYS_HAS_EARLY_PRINTK
         select USE_OF
@@ -908,7 +889,7 @@ config SCHED_OMIT_FRAME_POINTER
 #
 # Select some configuration options automatically based on user selections.
 #
-config ARC
+config FW_ARC
         bool
 
 config ARCH_MAY_HAVE_PC_FDC
@@ -926,11 +907,7 @@ config CEVT_DS1287
 config CEVT_GT641XX
         bool
 
-config CEVT_R4K_LIB
-        bool
-
 config CEVT_R4K
-        select CEVT_R4K_LIB
         bool
 
 config CEVT_SB1250
@@ -948,11 +925,7 @@ config CSRC_IOASIC
 config CSRC_POWERTV
         bool
 
-config CSRC_R4K_LIB
-        bool
-
 config CSRC_R4K
-        select CSRC_R4K_LIB
         bool
 
 config CSRC_SB1250
@@ -963,7 +936,7 @@ config GPIO_TXX9
         select ARCH_REQUIRE_GPIOLIB
         bool
 
-config CFE
+config FW_CFE
         bool
 
 config ARCH_DMA_ADDR_T_64BIT
@@ -1079,15 +1052,15 @@ config SYS_SUPPORTS_HUGETLBFS
         depends on CPU_SUPPORTS_HUGEPAGES && 64BIT
         default y
 
+config MIPS_HUGE_TLB_SUPPORT
+        def_bool HUGETLB_PAGE || TRANSPARENT_HUGEPAGE
+
 config IRQ_CPU
         bool
 
 config IRQ_CPU_RM7K
         bool
 
-config IRQ_CPU_RM9K
-        bool
-
 config IRQ_MSP_SLP
         bool
 
@@ -1112,10 +1085,6 @@ config PCI_GT64XXX_PCI0
 config NO_EXCEPT_FILL
         bool
 
-config MIPS_RM9122
-        bool
-        select SERIAL_RM9000
-
 config SOC_EMMA2RH
         bool
         select CEVT_R4K
@@ -1161,9 +1130,6 @@ config SOC_PNX8550
 config SWAP_IO_SPACE
         bool
 
-config SERIAL_RM9000
-        bool
-
 config SGI_HAS_INDYDOG
         bool
 
@@ -1185,7 +1151,7 @@ config SGI_HAS_I8042
 config DEFAULT_SGI_PARTITION
         bool
 
-config ARC32
+config FW_ARC32
         bool
 
 config SNIPROM
@@ -1218,7 +1184,7 @@ config ARC_PROMLIB
         depends on MACH_JAZZ || SNI_RM || SGI_IP22 || SGI_IP28 || SGI_IP32
         default y
 
-config ARC64
+config FW_ARC64
         bool
 
 config BOOT_ELF64
@@ -1370,6 +1336,7 @@ config CPU_R4X00
         depends on SYS_HAS_CPU_R4X00
         select CPU_SUPPORTS_32BIT_KERNEL
         select CPU_SUPPORTS_64BIT_KERNEL
+        select CPU_SUPPORTS_HUGEPAGES
         help
           MIPS Technologies R4000-series processors other than 4300, including
           the R4000, R4400, R4600, and 4700.
@@ -1380,12 +1347,14 @@ config CPU_TX49XX
         select CPU_HAS_PREFETCH
         select CPU_SUPPORTS_32BIT_KERNEL
         select CPU_SUPPORTS_64BIT_KERNEL
+        select CPU_SUPPORTS_HUGEPAGES
 
 config CPU_R5000
         bool "R5000"
         depends on SYS_HAS_CPU_R5000
         select CPU_SUPPORTS_32BIT_KERNEL
         select CPU_SUPPORTS_64BIT_KERNEL
+        select CPU_SUPPORTS_HUGEPAGES
         help
           MIPS Technologies R5000-series processors other than the Nevada.
 
@@ -1394,6 +1363,7 @@ config CPU_R5432
         depends on SYS_HAS_CPU_R5432
         select CPU_SUPPORTS_32BIT_KERNEL
         select CPU_SUPPORTS_64BIT_KERNEL
+        select CPU_SUPPORTS_HUGEPAGES
 
 config CPU_R5500
         bool "R5500"
@@ -1419,6 +1389,7 @@ config CPU_NEVADA
         depends on SYS_HAS_CPU_NEVADA
         select CPU_SUPPORTS_32BIT_KERNEL
         select CPU_SUPPORTS_64BIT_KERNEL
+        select CPU_SUPPORTS_HUGEPAGES
         help
           QED / PMC-Sierra RM52xx-series ("Nevada") processors.
 
@@ -1439,6 +1410,7 @@ config CPU_R10000
         select CPU_SUPPORTS_32BIT_KERNEL
         select CPU_SUPPORTS_64BIT_KERNEL
         select CPU_SUPPORTS_HIGHMEM
+        select CPU_SUPPORTS_HUGEPAGES
         help
           MIPS Technologies R10000-series processors.
 
@@ -1449,15 +1421,7 @@ config CPU_RM7000
         select CPU_SUPPORTS_32BIT_KERNEL
         select CPU_SUPPORTS_64BIT_KERNEL
         select CPU_SUPPORTS_HIGHMEM
-
-config CPU_RM9000
-        bool "RM9000"
-        depends on SYS_HAS_CPU_RM9000
-        select CPU_HAS_PREFETCH
-        select CPU_SUPPORTS_32BIT_KERNEL
-        select CPU_SUPPORTS_64BIT_KERNEL
-        select CPU_SUPPORTS_HIGHMEM
-        select WEAK_ORDERING
+        select CPU_SUPPORTS_HUGEPAGES
 
 config CPU_SB1
         bool "SB1"
@@ -1465,6 +1429,7 @@ config CPU_SB1
         select CPU_SUPPORTS_32BIT_KERNEL
         select CPU_SUPPORTS_64BIT_KERNEL
         select CPU_SUPPORTS_HIGHMEM
+        select CPU_SUPPORTS_HUGEPAGES
         select WEAK_ORDERING
 
 config CPU_CAVIUM_OCTEON
@@ -1528,9 +1493,9 @@ config CPU_XLR
         select CPU_SUPPORTS_32BIT_KERNEL
         select CPU_SUPPORTS_64BIT_KERNEL
         select CPU_SUPPORTS_HIGHMEM
+        select CPU_SUPPORTS_HUGEPAGES
         select WEAK_ORDERING
         select WEAK_REORDERING_BEYOND_LLSC
-        select CPU_SUPPORTS_HUGEPAGES
         help
           Netlogic Microsystems XLR/XLS processors.
 
@@ -1544,6 +1509,7 @@ config CPU_XLP
         select WEAK_ORDERING
         select WEAK_REORDERING_BEYOND_LLSC
         select CPU_HAS_PREFETCH
+        select CPU_MIPSR2
         help
           Netlogic Microsystems XLP processors.
 endchoice
@@ -1591,6 +1557,7 @@ config CPU_LOONGSON2
         select CPU_SUPPORTS_32BIT_KERNEL
         select CPU_SUPPORTS_64BIT_KERNEL
         select CPU_SUPPORTS_HIGHMEM
+        select CPU_SUPPORTS_HUGEPAGES
 
 config CPU_LOONGSON1
         bool
@@ -1675,9 +1642,6 @@ config SYS_HAS_CPU_R10000
 config SYS_HAS_CPU_RM7000
         bool
 
-config SYS_HAS_CPU_RM9000
-        bool
-
 config SYS_HAS_CPU_SB1
         bool
 
@@ -1757,7 +1721,7 @@ config CPU_SUPPORTS_UNCACHED_ACCELERATED
         bool
 config MIPS_PGD_C0_CONTEXT
         bool
-        default y if 64BIT && CPU_MIPSR2
+        default y if 64BIT && CPU_MIPSR2 && !CPU_XLP
 
 #
 # Set to y for ptrace access to watch registers.
@@ -2188,7 +2152,7 @@ config NODES_SHIFT
 
 config HW_PERF_EVENTS
         bool "Enable hardware performance counter support for perf events"
-        depends on PERF_EVENTS && !MIPS_MT_SMTC && OPROFILE=n && (CPU_MIPS32 || CPU_MIPS64 || CPU_R10000 || CPU_SB1 || CPU_CAVIUM_OCTEON)
+        depends on PERF_EVENTS && !MIPS_MT_SMTC && OPROFILE=n && (CPU_MIPS32 || CPU_MIPS64 || CPU_R10000 || CPU_SB1 || CPU_CAVIUM_OCTEON || CPU_XLP)
         default y
         help
           Enable hardware performance counter support for perf events. If
@@ -2366,6 +2330,29 @@ config KEXEC
           support.  As of this writing the exact hardware interface is
           strongly in flux, so no good recommendation can be made.
 
+config CRASH_DUMP
+          bool "Kernel crash dumps"
+          help
+          Generate crash dump after being started by kexec.
+          This should be normally only set in special crash dump kernels
+          which are loaded in the main kernel with kexec-tools into
+          a specially reserved region and then later executed after
+          a crash by kdump/kexec. The crash dump kernel must be compiled
+          to a memory address not used by the main kernel or firmware using
+          PHYSICAL_START.
+
+config PHYSICAL_START
+          hex "Physical address where the kernel is loaded"
+          default "0xffffffff84000000" if 64BIT
+          default "0x84000000" if 32BIT
+          depends on CRASH_DUMP
+          help
+          This gives the CKSEG0 or KSEG0 address where the kernel is loaded.
+          If you plan to use kernel for capturing the crash dump change
+          this value to start of the reserved region (the "X" value as
+          specified in the "crashkernel=YM@XM" command line boot parameter
+          passed to the panic-ed kernel).
+
 config SECCOMP
         bool "Enable seccomp to safely compute untrusted bytecode"
         depends on PROC_FS
@@ -2572,6 +2559,8 @@ source "net/Kconfig"
 
 source "drivers/Kconfig"
 
+source "drivers/firmware/Kconfig"
+
 source "fs/Kconfig"
 
 source "arch/mips/Kconfig.debug"