[PATCH v16 04/11] x86: kdump: move xen_pv_domain() check and insert_resource() to setup_arch()

[Zhen Lei]

From: Chen Zhou <chenzho...@huawei.com>

We will make the functions reserve_crashkernel() as generic, the
xen_pv_domain() check in reserve_crashkernel() is relevant only to
x86, the same as insert_resource() in reserve_crashkernel[_low]().
So move xen_pv_domain() check and insert_resource() to setup_arch()
to keep them in x86.

Suggested-by: Mike Rapoport <r...@kernel.org>
Signed-off-by: Chen Zhou <chenzho...@huawei.com>
Tested-by: John Donnelly <john.p.donne...@oracle.com>
Acked-by: Baoquan He <b...@redhat.com>
---
 arch/x86/kernel/setup.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 2330dcb83e8f06a..63ed089f9778fc3 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -456,7 +456,6 @@ static int __init reserve_crashkernel_low(void)
 
        crashk_low_res.start = low_base;
        crashk_low_res.end   = low_base + low_size - 1;
-       insert_resource(&iomem_resource, &crashk_low_res);
 #endif
        return 0;
 }
@@ -480,11 +479,6 @@ static void __init reserve_crashkernel(void)
                high = true;
        }
 
-       if (xen_pv_domain()) {
-               pr_info("Ignoring crashkernel for a Xen PV domain\n");
-               return;
-       }
-
        /* 0 means: find the address automatically */
        if (!crash_base) {
                /*
@@ -531,7 +525,6 @@ static void __init reserve_crashkernel(void)
 
        crashk_res.start = crash_base;
        crashk_res.end   = crash_base + crash_size - 1;
-       insert_resource(&iomem_resource, &crashk_res);
 }
 #else
 static void __init reserve_crashkernel(void)
@@ -1143,7 +1136,17 @@ void __init setup_arch(char **cmdline_p)
         * Reserve memory for crash kernel after SRAT is parsed so that it
         * won't consume hotpluggable memory.
         */
-       reserve_crashkernel();
+       if (xen_pv_domain())
+               pr_info("Ignoring crashkernel for a Xen PV domain\n");
+       else {
+               reserve_crashkernel();
+#ifdef CONFIG_KEXEC_CORE
+               if (crashk_res.end > crashk_res.start)
+                       insert_resource(&iomem_resource, &crashk_res);
+               if (crashk_low_res.end > crashk_low_res.start)
+                       insert_resource(&iomem_resource, &crashk_low_res);
+#endif
+       }
 
        memblock_find_dma_reserve();
 
-- 
2.25.1


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec