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

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (103 commits)
  powerpc: Fix bug in move of altivec code to vector.S
  powerpc: Add support for swiotlb on 32-bit
  powerpc/spufs: Remove unused error path
  powerpc: Fix warning when printing a resource_size_t
  powerpc/xmon: Remove unused variable in xmon.c
  powerpc/pseries: Fix warnings when printing resource_size_t
  powerpc: Shield code specific to 64-bit server processors
  powerpc: Separate PACA fields for server CPUs
  powerpc: Split exception handling out of head_64.S
  powerpc: Introduce CONFIG_PPC_BOOK3S
  powerpc: Move VMX and VSX asm code to vector.S
  powerpc: Set init_bootmem_done on NUMA platforms as well
  powerpc/mm: Fix a AB->BA deadlock scenario with nohash MMU context lock
  powerpc/mm: Fix some SMP issues with MMU context handling
  powerpc: Add PTRACE_SINGLEBLOCK support
  fbdev: Add PLB support and cleanup DCR in xilinxfb driver.
  powerpc/virtex: Add ml510 reference design device tree
  powerpc/virtex: Add Xilinx ML510 reference design support
  powerpc/virtex: refactor intc driver and add support for i8259 cascading
  powerpc/virtex: Add support for Xilinx PCI host bridge
  ...

4 files changed, 117 insertions, 40 deletions

diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index 3ee01b4f4257..661c8e02bcba 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -388,7 +388,7 @@ static void pci_dma_bus_setup_pSeries(struct pci_bus *bus)
 
                 while (pci->phb->dma_window_size * children > 0x80000000ul)
                         pci->phb->dma_window_size >>= 1;
-                pr_debug("No ISA/IDE, window size is 0x%lx\n",
+                pr_debug("No ISA/IDE, window size is 0x%llx\n",
                          pci->phb->dma_window_size);
                 pci->phb->dma_window_base_cur = 0;
 
@@ -414,7 +414,7 @@ static void pci_dma_bus_setup_pSeries(struct pci_bus *bus)
         while (pci->phb->dma_window_size * children > 0x70000000ul)
                 pci->phb->dma_window_size >>= 1;
 
-        pr_debug("ISA/IDE, window size is 0x%lx\n", pci->phb->dma_window_size);
+        pr_debug("ISA/IDE, window size is 0x%llx\n", pci->phb->dma_window_size);
 }
 
 
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 52a80e5840e8..e3139fa5e556 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -609,3 +609,55 @@ void __init hpte_init_lpar(void)
         ppc_md.flush_hash_range = pSeries_lpar_flush_hash_range;
         ppc_md.hpte_clear_all   = pSeries_lpar_hptab_clear;
 }
+
+#ifdef CONFIG_PPC_SMLPAR
+#define CMO_FREE_HINT_DEFAULT 1
+static int cmo_free_hint_flag = CMO_FREE_HINT_DEFAULT;
+
+static int __init cmo_free_hint(char *str)
+{
+        char *parm;
+        parm = strstrip(str);
+
+        if (strcasecmp(parm, "no") == 0 || strcasecmp(parm, "off") == 0) {
+                printk(KERN_INFO "cmo_free_hint: CMO free page hinting is not active.\n");
+                cmo_free_hint_flag = 0;
+                return 1;
+        }
+
+        cmo_free_hint_flag = 1;
+        printk(KERN_INFO "cmo_free_hint: CMO free page hinting is active.\n");
+
+        if (strcasecmp(parm, "yes") == 0 || strcasecmp(parm, "on") == 0)
+                return 1;
+
+        return 0;
+}
+
+__setup("cmo_free_hint=", cmo_free_hint);
+
+static void pSeries_set_page_state(struct page *page, int order,
+                                   unsigned long state)
+{
+        int i, j;
+        unsigned long cmo_page_sz, addr;
+
+        cmo_page_sz = cmo_get_page_size();
+        addr = __pa((unsigned long)page_address(page));
+
+        for (i = 0; i < (1 << order); i++, addr += PAGE_SIZE) {
+                for (j = 0; j < PAGE_SIZE; j += cmo_page_sz)
+                        plpar_hcall_norets(H_PAGE_INIT, state, addr + j, 0);
+        }
+}
+
+void arch_free_page(struct page *page, int order)
+{
+        if (!cmo_free_hint_flag || !firmware_has_feature(FW_FEATURE_CMO))
+                return;
+
+        pSeries_set_page_state(page, order, H_PAGE_SET_UNUSED);
+}
+EXPORT_SYMBOL(arch_free_page);
+
+#endif
diff --git a/arch/powerpc/platforms/pseries/rtasd.c b/arch/powerpc/platforms/pseries/rtasd.c
index afad9f5ac0ac..b3cbac855924 100644
--- a/arch/powerpc/platforms/pseries/rtasd.c
+++ b/arch/powerpc/platforms/pseries/rtasd.c
@@ -19,7 +19,7 @@
 #include <linux/vmalloc.h>
 #include <linux/spinlock.h>
 #include <linux/cpu.h>
-#include <linux/delay.h>
+#include <linux/workqueue.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -387,36 +387,51 @@ static void do_event_scan(void)
         } while(error == 0);
 }
 
-static void do_event_scan_all_cpus(long delay)
+static void rtas_event_scan(struct work_struct *w);
+DECLARE_DELAYED_WORK(event_scan_work, rtas_event_scan);
+
+/*
+ * Delay should be at least one second since some machines have problems if
+ * we call event-scan too quickly.
+ */
+static unsigned long event_scan_delay = 1*HZ;
+static int first_pass = 1;
+
+static void rtas_event_scan(struct work_struct *w)
 {
-        int cpu;
+        unsigned int cpu;
+
+        do_event_scan();
 
         get_online_cpus();
-        cpu = first_cpu(cpu_online_map);
-        for (;;) {
-                set_cpus_allowed(current, cpumask_of_cpu(cpu));
-                do_event_scan();
-                set_cpus_allowed(current, CPU_MASK_ALL);
-
-                /* Drop hotplug lock, and sleep for the specified delay */
-                put_online_cpus();
-                msleep_interruptible(delay);
-                get_online_cpus();
-
-                cpu = next_cpu(cpu, cpu_online_map);
-                if (cpu == NR_CPUS)
-                        break;
+
+        cpu = next_cpu(smp_processor_id(), cpu_online_map);
+        if (cpu == NR_CPUS) {
+                cpu = first_cpu(cpu_online_map);
+
+                if (first_pass) {
+                        first_pass = 0;
+                        event_scan_delay = 30*HZ/rtas_event_scan_rate;
+
+                        if (surveillance_timeout != -1) {
+                                pr_debug("rtasd: enabling surveillance\n");
+                                enable_surveillance(surveillance_timeout);
+                                pr_debug("rtasd: surveillance enabled\n");
+                        }
+                }
         }
+
+        schedule_delayed_work_on(cpu, &event_scan_work,
+                __round_jiffies_relative(event_scan_delay, cpu));
+
         put_online_cpus();
 }
 
-static int rtasd(void *unused)
+static void start_event_scan(void)
 {
         unsigned int err_type;
         int rc;
 
-        daemonize("rtasd");
-
         printk(KERN_DEBUG "RTAS daemon started\n");
         pr_debug("rtasd: will sleep for %d milliseconds\n",
                  (30000 / rtas_event_scan_rate));
@@ -434,22 +449,8 @@ static int rtasd(void *unused)
                 }
         }
 
-        /* First pass. */
-        do_event_scan_all_cpus(1000);
-
-        if (surveillance_timeout != -1) {
-                pr_debug("rtasd: enabling surveillance\n");
-                enable_surveillance(surveillance_timeout);
-                pr_debug("rtasd: surveillance enabled\n");
-        }
-
-        /* Delay should be at least one second since some
-         * machines have problems if we call event-scan too
-         * quickly. */
-        for (;;)
-                do_event_scan_all_cpus(30000/rtas_event_scan_rate);
-
-        return -EINVAL;
+        schedule_delayed_work_on(first_cpu(cpu_online_map), &event_scan_work,
+                                 event_scan_delay);
 }
 
 static int __init rtas_init(void)
@@ -487,8 +488,7 @@ static int __init rtas_init(void)
         if (!entry)
                 printk(KERN_ERR "Failed to create error_log proc entry\n");
 
-        if (kernel_thread(rtasd, NULL, CLONE_FS) < 0)
-                printk(KERN_ERR "Failed to start RTAS daemon\n");
+        start_event_scan();
 
         return 0;
 }
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index ec341707e41b..8d75ea21296f 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -63,6 +63,7 @@
 #include <asm/smp.h>
 #include <asm/firmware.h>
 #include <asm/eeh.h>
+#include <asm/pSeries_reconfig.h>
 
 #include "plpar_wrappers.h"
 #include "pseries.h"
@@ -254,6 +255,29 @@ static void __init pseries_discover_pic(void)
                " interrupt-controller\n");
 }
 
+static int pci_dn_reconfig_notifier(struct notifier_block *nb, unsigned long action, void *node)
+{
+        struct device_node *np = node;
+        struct pci_dn *pci = NULL;
+        int err = NOTIFY_OK;
+
+        switch (action) {
+        case PSERIES_RECONFIG_ADD:
+                pci = np->parent->data;
+                if (pci)
+                        update_dn_pci_info(np, pci->phb);
+                break;
+        default:
+                err = NOTIFY_DONE;
+                break;
+        }
+        return err;
+}
+
+static struct notifier_block pci_dn_reconfig_nb = {
+        .notifier_call = pci_dn_reconfig_notifier,
+};
+
 static void __init pSeries_setup_arch(void)
 {
         /* Discover PIC type and setup ppc_md accordingly */
@@ -271,6 +295,7 @@ static void __init pSeries_setup_arch(void)
         /* Find and initialize PCI host bridges */
         init_pci_config_tokens();
         find_and_init_phbs();
+        pSeries_reconfig_notifier_register(&pci_dn_reconfig_nb);
         eeh_init();
 
         pSeries_nvram_init();