x86/xen: split off enlighten_pvh.c

Create enlighten_pvh.c by splitting off PVH related code from enlighten.c,
put it under CONFIG_XEN_PVH.

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Juergen Gross <jgross@suse.com>

diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile
index cb0164aee156266cd0e02bf2ed466a49102cfa44..348128b1c55a6f5ff4e539c6ac7176d9ad1ee0bc 100644 (file)
--- a/arch/x86/xen/Makefile
+++ b/arch/x86/xen/Makefile
@@ -15,6 +15,8 @@ obj-y         := enlighten.o setup.o multicalls.o mmu.o irq.o \
                        grant-table.o suspend.o platform-pci-unplug.o \
                        p2m.o apic.o pmu.o
 
+obj-$(CONFIG_XEN_PVH)                  += enlighten_pvh.o
+
 obj-$(CONFIG_EVENT_TRACING) += trace.o
 
 obj-$(CONFIG_SMP)              += smp.o

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 7b55408ff0ab1791d186743b889e7d77e7ae305b..2e392e9d83cbefca9c7527c17962a087c8bb23a4 100644 (file)
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -180,20 +180,6 @@ struct tls_descs {
  */
 static DEFINE_PER_CPU(struct tls_descs, shadow_tls_desc);
 
-#ifdef CONFIG_XEN_PVH
-/*
- * PVH variables.
- *
- * xen_pvh and pvh_bootparams need to live in data segment since they
- * are used after startup_{32|64}, which clear .bss, are invoked.
- */
-bool xen_pvh __attribute__((section(".data"))) = 0;
-struct boot_params pvh_bootparams __attribute__((section(".data")));
-
-struct hvm_start_info pvh_start_info;
-unsigned int pvh_start_info_sz = sizeof(pvh_start_info);
-#endif
-
 static void clamp_max_cpus(void)
 {
 #ifdef CONFIG_SMP
@@ -1674,100 +1660,6 @@ asmlinkage __visible void __init xen_start_kernel(void)
 #endif
 }
 
-#ifdef CONFIG_XEN_PVH
-
-static void xen_pvh_arch_setup(void)
-{
-#ifdef CONFIG_ACPI
-       /* Make sure we don't fall back to (default) ACPI_IRQ_MODEL_PIC. */
-       if (nr_ioapics == 0)
-               acpi_irq_model = ACPI_IRQ_MODEL_PLATFORM;
-#endif
-}
-
-static void __init init_pvh_bootparams(void)
-{
-       struct xen_memory_map memmap;
-       unsigned int i;
-       int rc;
-
-       memset(&pvh_bootparams, 0, sizeof(pvh_bootparams));
-
-       memmap.nr_entries = ARRAY_SIZE(pvh_bootparams.e820_table);
-       set_xen_guest_handle(memmap.buffer, pvh_bootparams.e820_table);
-       rc = HYPERVISOR_memory_op(XENMEM_memory_map, &memmap);
-       if (rc) {
-               xen_raw_printk("XENMEM_memory_map failed (%d)\n", rc);
-               BUG();
-       }
-
-       if (memmap.nr_entries < E820_MAX_ENTRIES_ZEROPAGE - 1) {
-               pvh_bootparams.e820_table[memmap.nr_entries].addr =
-                       ISA_START_ADDRESS;
-               pvh_bootparams.e820_table[memmap.nr_entries].size =
-                       ISA_END_ADDRESS - ISA_START_ADDRESS;
-               pvh_bootparams.e820_table[memmap.nr_entries].type =
-                       E820_TYPE_RESERVED;
-               memmap.nr_entries++;
-       } else
-               xen_raw_printk("Warning: Can fit ISA range into e820\n");
-
-       pvh_bootparams.e820_entries = memmap.nr_entries;
-       for (i = 0; i < pvh_bootparams.e820_entries; i++)
-               e820__range_add(pvh_bootparams.e820_table[i].addr,
-                               pvh_bootparams.e820_table[i].size,
-                               pvh_bootparams.e820_table[i].type);
-
-       e820__update_table(e820_table);
-
-       pvh_bootparams.hdr.cmd_line_ptr =
-               pvh_start_info.cmdline_paddr;
-
-       /* The first module is always ramdisk. */
-       if (pvh_start_info.nr_modules) {
-               struct hvm_modlist_entry *modaddr =
-                       __va(pvh_start_info.modlist_paddr);
-               pvh_bootparams.hdr.ramdisk_image = modaddr->paddr;
-               pvh_bootparams.hdr.ramdisk_size = modaddr->size;
-       }
-
-       /*
-        * See Documentation/x86/boot.txt.
-        *
-        * Version 2.12 supports Xen entry point but we will use default x86/PC
-        * environment (i.e. hardware_subarch 0).
-        */
-       pvh_bootparams.hdr.version = 0x212;
-       pvh_bootparams.hdr.type_of_loader = (9 << 4) | 0; /* Xen loader */
-}
-
-/*
- * This routine (and those that it might call) should not use
- * anything that lives in .bss since that segment will be cleared later.
- */
-void __init xen_prepare_pvh(void)
-{
-       u32 msr;
-       u64 pfn;
-
-       if (pvh_start_info.magic != XEN_HVM_START_MAGIC_VALUE) {
-               xen_raw_printk("Error: Unexpected magic value (0x%08x)\n",
-                               pvh_start_info.magic);
-               BUG();
-       }
-
-       xen_pvh = 1;
-
-       msr = cpuid_ebx(xen_cpuid_base() + 2);
-       pfn = __pa(hypercall_page);
-       wrmsr_safe(msr, (u32)pfn, (u32)(pfn >> 32));
-
-       init_pvh_bootparams();
-
-       x86_init.oem.arch_setup = xen_pvh_arch_setup;
-}
-#endif
-
 void __ref xen_hvm_init_shared_info(void)
 {
        int cpu;

diff --git a/arch/x86/xen/enlighten_pvh.c b/arch/x86/xen/enlighten_pvh.c
new file mode 100644 (file)
index 0000000..a4272c8
--- /dev/null
+++ b/arch/x86/xen/enlighten_pvh.c
@@ -0,0 +1,114 @@
+#include <linux/acpi.h>
+
+#include <xen/hvc-console.h>
+
+#include <asm/io_apic.h>
+#include <asm/hypervisor.h>
+#include <asm/e820/api.h>
+
+#include <asm/xen/interface.h>
+#include <asm/xen/hypercall.h>
+
+#include <xen/interface/memory.h>
+#include <xen/interface/hvm/start_info.h>
+
+/*
+ * PVH variables.
+ *
+ * xen_pvh and pvh_bootparams need to live in data segment since they
+ * are used after startup_{32|64}, which clear .bss, are invoked.
+ */
+bool xen_pvh __attribute__((section(".data"))) = 0;
+struct boot_params pvh_bootparams __attribute__((section(".data")));
+
+struct hvm_start_info pvh_start_info;
+unsigned int pvh_start_info_sz = sizeof(pvh_start_info);
+
+static void xen_pvh_arch_setup(void)
+{
+       /* Make sure we don't fall back to (default) ACPI_IRQ_MODEL_PIC. */
+       if (nr_ioapics == 0)
+               acpi_irq_model = ACPI_IRQ_MODEL_PLATFORM;
+}
+
+static void __init init_pvh_bootparams(void)
+{
+       struct xen_memory_map memmap;
+       unsigned int i;
+       int rc;
+
+       memset(&pvh_bootparams, 0, sizeof(pvh_bootparams));
+
+       memmap.nr_entries = ARRAY_SIZE(pvh_bootparams.e820_table);
+       set_xen_guest_handle(memmap.buffer, pvh_bootparams.e820_table);
+       rc = HYPERVISOR_memory_op(XENMEM_memory_map, &memmap);
+       if (rc) {
+               xen_raw_printk("XENMEM_memory_map failed (%d)\n", rc);
+               BUG();
+       }
+
+       if (memmap.nr_entries < E820_MAX_ENTRIES_ZEROPAGE - 1) {
+               pvh_bootparams.e820_table[memmap.nr_entries].addr =
+                       ISA_START_ADDRESS;
+               pvh_bootparams.e820_table[memmap.nr_entries].size =
+                       ISA_END_ADDRESS - ISA_START_ADDRESS;
+               pvh_bootparams.e820_table[memmap.nr_entries].type =
+                       E820_TYPE_RESERVED;
+               memmap.nr_entries++;
+       } else
+               xen_raw_printk("Warning: Can fit ISA range into e820\n");
+
+       pvh_bootparams.e820_entries = memmap.nr_entries;
+       for (i = 0; i < pvh_bootparams.e820_entries; i++)
+               e820__range_add(pvh_bootparams.e820_table[i].addr,
+                               pvh_bootparams.e820_table[i].size,
+                               pvh_bootparams.e820_table[i].type);
+
+       e820__update_table(e820_table);
+
+       pvh_bootparams.hdr.cmd_line_ptr =
+               pvh_start_info.cmdline_paddr;
+
+       /* The first module is always ramdisk. */
+       if (pvh_start_info.nr_modules) {
+               struct hvm_modlist_entry *modaddr =
+                       __va(pvh_start_info.modlist_paddr);
+               pvh_bootparams.hdr.ramdisk_image = modaddr->paddr;
+               pvh_bootparams.hdr.ramdisk_size = modaddr->size;
+       }
+
+       /*
+        * See Documentation/x86/boot.txt.
+        *
+        * Version 2.12 supports Xen entry point but we will use default x86/PC
+        * environment (i.e. hardware_subarch 0).
+        */
+       pvh_bootparams.hdr.version = 0x212;
+       pvh_bootparams.hdr.type_of_loader = (9 << 4) | 0; /* Xen loader */
+}
+
+/*
+ * This routine (and those that it might call) should not use
+ * anything that lives in .bss since that segment will be cleared later.
+ */
+void __init xen_prepare_pvh(void)
+{
+       u32 msr;
+       u64 pfn;
+
+       if (pvh_start_info.magic != XEN_HVM_START_MAGIC_VALUE) {
+               xen_raw_printk("Error: Unexpected magic value (0x%08x)\n",
+                               pvh_start_info.magic);
+               BUG();
+       }
+
+       xen_pvh = 1;
+
+       msr = cpuid_ebx(xen_cpuid_base() + 2);
+       pfn = __pa(hypercall_page);
+       wrmsr_safe(msr, (u32)pfn, (u32)(pfn >> 32));
+
+       init_pvh_bootparams();
+
+       x86_init.oem.arch_setup = xen_pvh_arch_setup;
+}