Merge tag 'powerpc-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

Pull more powerpc updates from Michael Ellerman:
 "Some more powerpc updates for 4.9:

  Freescale updates from Scott Wood:
   - qbman support (a prerequisite for datapath drivers such as ethernet)
   - a PCI DMA fix+improvement
   - reset handler changes
   - more 8xx optimizations
   - some cleanups and fixes.'

  Fixes:
   - selftests/powerpc: Add missing binaries to .gitignores (Michael Ellerman)
   - selftests/powerpc: Fix build break caused by EXPORT_SYMBOL changes (Michael Ellerman)
   - powerpc/pseries: Fix stack corruption in htpe code (Laurent Dufour)
   - powerpc/64s: Fix power4_fixup_nap placement (Nicholas Piggin)
   - powerpc/64: Fix incorrect return value from __copy_tofrom_user (Paul Mackerras)
   - powerpc/mm/hash64: Fix might_have_hea() check (Michael Ellerman)

  Other:
   - MAINTAINERS: Remove myself from PA Semi entries (Olof Johansson)
   - MAINTAINERS: Drop separate pseries entry (Michael Ellerman)
   - MAINTAINERS: Update powerpc website & add selftests (Michael Ellerman):

* tag 'powerpc-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (35 commits)
  powerpc/mm/hash64: Fix might_have_hea() check
  powerpc/64: Fix incorrect return value from __copy_tofrom_user
  powerpc/64s: Fix power4_fixup_nap placement
  powerpc/pseries: Fix stack corruption in htpe code
  selftests/powerpc: Fix build break caused by EXPORT_SYMBOL changes
  MAINTAINERS: Update powerpc website & add selftests
  MAINTAINERS: Drop separate pseries entry
  MAINTAINERS: Remove myself from PA Semi entries
  selftests/powerpc: Add missing binaries to .gitignores
  arch/powerpc: Add CONFIG_FSL_DPAA to corenetXX_smp_defconfig
  soc/qman: Add self-test for QMan driver
  soc/bman: Add self-test for BMan driver
  soc/fsl: Introduce DPAA 1.x QMan device driver
  soc/fsl: Introduce DPAA 1.x BMan device driver
  powerpc/8xx: make user addr DTLB miss the short path
  powerpc/8xx: Move additional DTLBMiss handlers out of exception area
  powerpc/8xx: use r3 to scratch CR in ITLBmiss
  soc/fsl/qe: fix gpio save_regs functions
  powerpc/8xx: add dedicated machine check handler
  powerpc/8xx: add system_reset_exception
  ...

7 files changed, 41 insertions, 29 deletions

diff --git a/arch/powerpc/sysdev/cpm1.c b/arch/powerpc/sysdev/cpm1.c
index 3c0eb9b25535..986cd111d4df 100644
--- a/arch/powerpc/sysdev/cpm1.c
+++ b/arch/powerpc/sysdev/cpm1.c
@@ -233,8 +233,6 @@ void __init cpm_reset(void)
         else
                 out_be32(&siu_conf->sc_sdcr, 1);
         immr_unmap(siu_conf);
-
-        cpm_muram_init();
 }
 
 static DEFINE_SPINLOCK(cmd_lock);
diff --git a/arch/powerpc/sysdev/cpm2.c b/arch/powerpc/sysdev/cpm2.c
index 8dc1e24f3c23..f78ff841652c 100644
--- a/arch/powerpc/sysdev/cpm2.c
+++ b/arch/powerpc/sysdev/cpm2.c
@@ -66,10 +66,6 @@ void __init cpm2_reset(void)
         cpm2_immr = ioremap(get_immrbase(), CPM_MAP_SIZE);
 #endif
 
-        /* Reclaim the DP memory for our use.
-         */
-        cpm_muram_init();
-
         /* Tell everyone where the comm processor resides.
          */
         cpmp = &cpm2_immr->im_cpm;
diff --git a/arch/powerpc/sysdev/cpm_common.c b/arch/powerpc/sysdev/cpm_common.c
index 947f42007734..51bf749a4f3a 100644
--- a/arch/powerpc/sysdev/cpm_common.c
+++ b/arch/powerpc/sysdev/cpm_common.c
@@ -37,6 +37,21 @@
 #include <linux/of_gpio.h>
 #endif
 
+static int __init cpm_init(void)
+{
+        struct device_node *np;
+
+        np = of_find_compatible_node(NULL, NULL, "fsl,cpm1");
+        if (!np)
+                np = of_find_compatible_node(NULL, NULL, "fsl,cpm2");
+        if (!np)
+                return -ENODEV;
+        cpm_muram_init();
+        of_node_put(np);
+        return 0;
+}
+subsys_initcall(cpm_init);
+
 #ifdef CONFIG_PPC_EARLY_DEBUG_CPM
 static u32 __iomem *cpm_udbg_txdesc;
 static u8 __iomem *cpm_udbg_txbuf;
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 0ef9df49f0f2..d3a597456b6e 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -111,8 +111,7 @@ static struct pci_ops fsl_indirect_pcie_ops =
         .write = indirect_write_config,
 };
 
-#define MAX_PHYS_ADDR_BITS      40
-static u64 pci64_dma_offset = 1ull << MAX_PHYS_ADDR_BITS;
+static u64 pci64_dma_offset;
 
 #ifdef CONFIG_SWIOTLB
 static void setup_swiotlb_ops(struct pci_controller *hose)
@@ -132,12 +131,10 @@ static int fsl_pci_dma_set_mask(struct device *dev, u64 dma_mask)
                 return -EIO;
 
         /*
-         * Fixup PCI devices that are able to DMA to above the physical
-         * address width of the SoC such that we can address any internal
-         * SoC address from across PCI if needed
+         * Fix up PCI devices that are able to DMA to the large inbound
+         * mapping that allows addressing any RAM address from across PCI.
          */
-        if ((dev_is_pci(dev)) &&
-            dma_mask >= DMA_BIT_MASK(MAX_PHYS_ADDR_BITS)) {
+        if (dev_is_pci(dev) && dma_mask >= pci64_dma_offset * 2 - 1) {
                 set_dma_ops(dev, &dma_direct_ops);
                 set_dma_offset(dev, pci64_dma_offset);
         }
@@ -387,6 +384,7 @@ static void setup_pci_atmu(struct pci_controller *hose)
                                 mem_log++;
 
                         piwar = (piwar & ~PIWAR_SZ_MASK) | (mem_log - 1);
+                        pci64_dma_offset = 1ULL << mem_log;
 
                         if (setup_inbound) {
                                 /* Setup inbound memory window */
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index a09ca704de58..d93056eedcb0 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -29,6 +29,7 @@
 #include <linux/fsl_devices.h>
 #include <linux/fs_enet_pd.h>
 #include <linux/fs_uart_pd.h>
+#include <linux/reboot.h>
 
 #include <linux/atomic.h>
 #include <asm/io.h>
@@ -180,23 +181,38 @@ EXPORT_SYMBOL(get_baudrate);
 #if defined(CONFIG_FSL_SOC_BOOKE) || defined(CONFIG_PPC_86xx)
 static __be32 __iomem *rstcr;
 
+static int fsl_rstcr_restart(struct notifier_block *this,
+                             unsigned long mode, void *cmd)
+{
+        local_irq_disable();
+        /* set reset control register */
+        out_be32(rstcr, 0x2);   /* HRESET_REQ */
+
+        return NOTIFY_DONE;
+}
+
 static int __init setup_rstcr(void)
 {
         struct device_node *np;
 
+        static struct notifier_block restart_handler = {
+                .notifier_call = fsl_rstcr_restart,
+                .priority = 128,
+        };
+
         for_each_node_by_name(np, "global-utilities") {
                 if ((of_get_property(np, "fsl,has-rstcr", NULL))) {
                         rstcr = of_iomap(np, 0) + 0xb0;
-                        if (!rstcr)
+                        if (!rstcr) {
                                 printk (KERN_ERR "Error: reset control "
                                                 "register not mapped!\n");
+                        } else {
+                                register_restart_handler(&restart_handler);
+                        }
                         break;
                 }
         }
 
-        if (!rstcr && ppc_md.restart == fsl_rstcr_restart)
-                printk(KERN_ERR "No RSTCR register, warm reboot won't work\n");
-
         of_node_put(np);
 
         return 0;
@@ -204,15 +220,6 @@ static int __init setup_rstcr(void)
 
 arch_initcall(setup_rstcr);
 
-void __noreturn fsl_rstcr_restart(char *cmd)
-{
-        local_irq_disable();
-        if (rstcr)
-                /* set reset control register */
-                out_be32(rstcr, 0x2);   /* HRESET_REQ */
-
-        while (1) ;
-}
 #endif
 
 #if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE)
diff --git a/arch/powerpc/sysdev/fsl_soc.h b/arch/powerpc/sysdev/fsl_soc.h
index 433566a5ef19..d73daa4f0ccf 100644
--- a/arch/powerpc/sysdev/fsl_soc.h
+++ b/arch/powerpc/sysdev/fsl_soc.h
@@ -19,8 +19,6 @@ extern u32 fsl_get_sys_freq(void);
 struct spi_board_info;
 struct device_node;
 
-extern void __noreturn fsl_rstcr_restart(char *cmd);
-
 /* The different ports that the DIU can be connected to */
 enum fsl_diu_monitor_port {
         FSL_DIU_PORT_DVI,       /* DVI */
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index 4d48cecfedd1..b9aac951a90f 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -1249,7 +1249,7 @@ struct mpic * __init mpic_alloc(struct device_node *node,
         /* Pick the physical address from the device tree if unspecified */
         if (!phys_addr) {
                 /* Check if it is DCR-based */
-                if (of_get_property(node, "dcr-reg", NULL)) {
+                if (of_property_read_bool(node, "dcr-reg")) {
                         flags |= MPIC_USES_DCR;
                 } else {
                         struct resource r;