Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (185 commits)
  powerpc: fix compile error with 85xx/p1010rdb.c
  powerpc: fix compile error with 85xx/p1023_rds.c
  powerpc/fsl: add MSI support for the Freescale hypervisor
  arch/powerpc/sysdev/fsl_rmu.c: introduce missing kfree
  powerpc/fsl: Add support for Integrated Flash Controller
  powerpc/fsl: update compatiable on fsl 16550 uart nodes
  powerpc/85xx: fix PCI and localbus properties in p1022ds.dts
  powerpc/85xx: re-enable ePAPR byte channel driver in corenet32_smp_defconfig
  powerpc/fsl: Update defconfigs to enable some standard FSL HW features
  powerpc: Add TBI PHY node to first MDIO bus
  sbc834x: put full compat string in board match check
  powerpc/fsl-pci: Allow 64-bit PCIe devices to DMA to any memory address
  powerpc: Fix unpaired probe_hcall_entry and probe_hcall_exit
  offb: Fix setting of the pseudo-palette for >8bpp
  offb: Add palette hack for qemu "standard vga" framebuffer
  offb: Fix bug in calculating requested vram size
  powerpc/boot: Change the WARN to INFO for boot wrapper overlap message
  powerpc/44x: Fix build error on currituck platform
  powerpc/boot: Change the load address for the wrapper to fit the kernel
  powerpc/44x: Enable CRASH_DUMP for 440x
  ...

Fix up a trivial conflict in arch/powerpc/include/asm/cputime.h due to
the additional sparse-checking code for cputime_t.

1 files changed, 46 insertions, 8 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index ead0bc68439d..692ac7588e20 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -87,6 +87,10 @@ config ARCH_HAS_ILOG2_U64
         bool
         default y if 64BIT
 
+config ARCH_HAS_CPU_IDLE_WAIT
+        bool
+        default y
+
 config GENERIC_HWEIGHT
         bool
         default y
@@ -133,6 +137,7 @@ config PPC
         select IRQ_PER_CPU
         select GENERIC_IRQ_SHOW
         select GENERIC_IRQ_SHOW_LEVEL
+        select IRQ_FORCED_THREADING
         select HAVE_RCU_TABLE_FREE if SMP
         select HAVE_SYSCALL_TRACEPOINTS
         select HAVE_BPF_JIT if (PPC64 && NET)
@@ -363,8 +368,9 @@ config KEXEC
 
 config CRASH_DUMP
         bool "Build a kdump crash kernel"
-        depends on PPC64 || 6xx || FSL_BOOKE
-        select RELOCATABLE if PPC64 || FSL_BOOKE
+        depends on PPC64 || 6xx || FSL_BOOKE || (44x && !SMP && !PPC_47x)
+        select RELOCATABLE if PPC64 || 44x
+        select DYNAMIC_MEMSTART if FSL_BOOKE
         help
           Build a kernel suitable for use as a kdump capture kernel.
           The same kernel binary can be used as production kernel and dump
@@ -685,6 +691,10 @@ config FSL_LBC
           controller.  Also contains some common code used by
           drivers for specific local bus peripherals.
 
+config FSL_IFC
+        bool
+        depends on FSL_SOC
+
 config FSL_GTM
         bool
         depends on PPC_83xx || QUICC_ENGINE || CPM2
@@ -770,6 +780,10 @@ source "drivers/rapidio/Kconfig"
 
 endmenu
 
+config NONSTATIC_KERNEL
+        bool
+        default n
+
 menu "Advanced setup"
         depends on PPC32
 
@@ -819,13 +833,32 @@ config LOWMEM_CAM_NUM
         int "Number of CAMs to use to map low memory" if LOWMEM_CAM_NUM_BOOL
         default 3
 
+config DYNAMIC_MEMSTART
+        bool "Enable page aligned dynamic load address for kernel (EXPERIMENTAL)"
+        depends on EXPERIMENTAL && ADVANCED_OPTIONS && FLATMEM && (FSL_BOOKE || 44x)
+        select NONSTATIC_KERNEL
+        help
+          This option enables the kernel to be loaded at any page aligned
+          physical address. The kernel creates a mapping from KERNELBASE to 
+          the address where the kernel is loaded. The page size here implies
+          the TLB page size of the mapping for kernel on the particular platform.
+          Please refer to the init code for finding the TLB page size.
+
+          DYNAMIC_MEMSTART is an easy way of implementing pseudo-RELOCATABLE
+          kernel image, where the only restriction is the page aligned kernel
+          load address. When this option is enabled, the compile time physical 
+          address CONFIG_PHYSICAL_START is ignored.
+
+          This option is overridden by CONFIG_RELOCATABLE
+
 config RELOCATABLE
         bool "Build a relocatable kernel (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && ADVANCED_OPTIONS && FLATMEM && (FSL_BOOKE || PPC_47x)
+        depends on EXPERIMENTAL && ADVANCED_OPTIONS && FLATMEM && 44x
+        select NONSTATIC_KERNEL
         help
           This builds a kernel image that is capable of running at the
-          location the kernel is loaded at (some alignment restrictions may
-          exist).
+          location the kernel is loaded at, without any alignment restrictions.
+          This feature is a superset of DYNAMIC_MEMSTART and hence overrides it.
 
           One use is for the kexec on panic case where the recovery kernel
           must live at a different physical address than the primary
@@ -835,7 +868,11 @@ config RELOCATABLE
           it has been loaded at and the compile time physical addresses
           CONFIG_PHYSICAL_START is ignored.  However CONFIG_PHYSICAL_START
           setting can still be useful to bootwrappers that need to know the
-          load location of the kernel (eg. u-boot/mkimage).
+          load address of the kernel (eg. u-boot/mkimage).
+
+config RELOCATABLE_PPC32
+        def_bool y
+        depends on PPC32 && RELOCATABLE
 
 config PAGE_OFFSET_BOOL
         bool "Set custom page offset address"
@@ -865,7 +902,7 @@ config KERNEL_START_BOOL
 config KERNEL_START
         hex "Virtual address of kernel base" if KERNEL_START_BOOL
         default PAGE_OFFSET if PAGE_OFFSET_BOOL
-        default "0xc2000000" if CRASH_DUMP && !RELOCATABLE
+        default "0xc2000000" if CRASH_DUMP && !NONSTATIC_KERNEL
         default "0xc0000000"
 
 config PHYSICAL_START_BOOL
@@ -878,7 +915,7 @@ config PHYSICAL_START_BOOL
 
 config PHYSICAL_START
         hex "Physical address where the kernel is loaded" if PHYSICAL_START_BOOL
-        default "0x02000000" if PPC_STD_MMU && CRASH_DUMP && !RELOCATABLE
+        default "0x02000000" if PPC_STD_MMU && CRASH_DUMP && !NONSTATIC_KERNEL
         default "0x00000000"
 
 config PHYSICAL_ALIGN
@@ -924,6 +961,7 @@ endmenu
 if PPC64
 config RELOCATABLE
         bool "Build a relocatable kernel"
+        select NONSTATIC_KERNEL
         help
           This builds a kernel image that is capable of running anywhere
           in the RMA (real memory area) at any 16k-aligned base address.