1 files changed, 43 insertions, 3 deletions

diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 5015ca1275ca..632cda8f2e76 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -239,6 +239,25 @@ __initcall(register_memory);
 
 
 #ifdef CONFIG_KEXEC
+
+/*
+ * This function checks if the reserved crashkernel is allowed on the specific
+ * IA64 machine flavour. Machines without an IO TLB use swiotlb and require
+ * some memory below 4 GB (i.e. in 32 bit area), see the implementation of
+ * lib/swiotlb.c. The hpzx1 architecture has an IO TLB but cannot use that
+ * in kdump case. See the comment in sba_init() in sba_iommu.c.
+ *
+ * So, the only machvec that really supports loading the kdump kernel
+ * over 4 GB is "sn2".
+ */
+static int __init check_crashkernel_memory(unsigned long pbase, size_t size)
+{
+        if (ia64_platform_is("sn2") || ia64_platform_is("uv"))
+                return 1;
+        else
+                return pbase < (1UL << 32);
+}
+
 static void __init setup_crashkernel(unsigned long total, int *n)
 {
         unsigned long long base = 0, size = 0;
@@ -252,6 +271,16 @@ static void __init setup_crashkernel(unsigned long total, int *n)
                         base = kdump_find_rsvd_region(size,
                                         rsvd_region, *n);
                 }
+
+                if (!check_crashkernel_memory(base, size)) {
+                        pr_warning("crashkernel: There would be kdump memory "
+                                "at %ld GB but this is unusable because it "
+                                "must\nbe below 4 GB. Change the memory "
+                                "configuration of the machine.\n",
+                                (unsigned long)(base >> 30));
+                        return;
+                }
+
                 if (base != ~0UL) {
                         printk(KERN_INFO "Reserving %ldMB of memory at %ldMB "
                                         "for crashkernel (System RAM: %ldMB)\n",
@@ -518,7 +547,8 @@ setup_arch (char **cmdline_p)
 # ifdef CONFIG_ACPI_NUMA
         acpi_numa_init();
         per_cpu_scan_finalize((cpus_weight(early_cpu_possible_map) == 0 ?
-                32 : cpus_weight(early_cpu_possible_map)), additional_cpus);
+                32 : cpus_weight(early_cpu_possible_map)),
+                additional_cpus > 0 ? additional_cpus : 0);
 # endif
 #else
 # ifdef CONFIG_SMP
@@ -531,6 +561,17 @@ setup_arch (char **cmdline_p)
         /* process SAL system table: */
         ia64_sal_init(__va(efi.sal_systab));
 
+#ifdef CONFIG_ITANIUM
+        ia64_patch_rse((u64) __start___rse_patchlist, (u64) __end___rse_patchlist);
+#else
+        {
+                u64 num_phys_stacked;
+
+                if (ia64_pal_rse_info(&num_phys_stacked, 0) == 0 && num_phys_stacked > 96)
+                        ia64_patch_rse((u64) __start___rse_patchlist, (u64) __end___rse_patchlist);
+        }
+#endif
+
 #ifdef CONFIG_SMP
         cpu_physical_id(0) = hard_smp_processor_id();
 #endif
@@ -538,8 +579,6 @@ setup_arch (char **cmdline_p)
         cpu_init();     /* initialize the bootstrap CPU */
         mmu_context_init();     /* initialize context_id bitmap */
 
-        check_sal_cache_flush();
-
 #ifdef CONFIG_ACPI
         acpi_boot_init();
 #endif
@@ -567,6 +606,7 @@ setup_arch (char **cmdline_p)
                 ia64_mca_init();
 
         platform_setup(cmdline_p);
+        check_sal_cache_flush();
         paging_init();
 }