x86, realmode: don't copy real_mode_header

Replaced copying of real_mode_header with a pointer
to beginning of RM memory.

Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@intel.com>
Link: http://lkml.kernel.org/r/1336501366-28617-19-git-send-email-jarkko.sakkinen@intel.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
index 1bfc74d213a4c7e96751bfd82d2124b3d50517fb..d3ae49f4c3ef82a2aebe1c228cec208f340d22c0 100644 (file)
--- a/arch/x86/include/asm/realmode.h
+++ b/arch/x86/include/asm/realmode.h
@@ -8,7 +8,6 @@
 struct real_mode_header {
        u32     text_start;
        u32     ro_end;
-       u32     end;
        /* reboot */
 #ifdef CONFIG_X86_32
        u32     machine_real_restart_asm;
@@ -30,8 +29,8 @@ struct real_mode_header {
 #endif
 } __attribute__((__packed__));
 
-extern struct real_mode_header real_mode_header;
-extern unsigned char *real_mode_base;
+extern struct real_mode_header *real_mode_header;
+extern unsigned char real_mode_blob_end[];
 
 extern unsigned long init_rsp;
 extern unsigned long initial_code;

diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
index d941b62da4b60ca0ced0dc125881606232666486..6ca3f54ebe7df737e7e344f30a69a16baf0e978f 100644 (file)
--- a/arch/x86/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep.c
@@ -38,7 +38,7 @@ asmlinkage void acpi_enter_s3(void)
 int acpi_suspend_lowlevel(void)
 {
        struct wakeup_header *header =
-               (struct wakeup_header *) __va(real_mode_header.wakeup_header);
+               (struct wakeup_header *) __va(real_mode_header->wakeup_header);
 
        if (header->signature != WAKEUP_HEADER_SIGNATURE) {
                printk(KERN_ERR "wakeup header does not match\n");

diff --git a/arch/x86/kernel/realmode.c b/arch/x86/kernel/realmode.c
index e7bf82a409bf872b8de0a9a594dbc1a7698123d5..632c810ec8eaf4f3bbd2aeca4ff8700d92f5f447 100644 (file)
--- a/arch/x86/kernel/realmode.c
+++ b/arch/x86/kernel/realmode.c
@@ -5,8 +5,7 @@
 #include <asm/pgtable.h>
 #include <asm/realmode.h>
 
-unsigned char *real_mode_base;
-struct real_mode_header real_mode_header;
+struct real_mode_header *real_mode_header;
 
 void __init setup_real_mode(void)
 {
@@ -17,33 +16,32 @@ void __init setup_real_mode(void)
        u32 *ptr;
        u16 *seg;
        int i;
+       unsigned char *base;
 
-       struct real_mode_header *header =
-               (struct real_mode_header *) real_mode_blob;
-
-       size_t size = PAGE_ALIGN(header->end);
+       size_t size = PAGE_ALIGN(real_mode_blob_end - real_mode_blob);
 
        /* Has to be in very low memory so we can execute real-mode AP code. */
        mem = memblock_find_in_range(0, 1<<20, size, PAGE_SIZE);
        if (!mem)
                panic("Cannot allocate trampoline\n");
 
-       real_mode_base = __va(mem);
+       base = __va(mem);
        memblock_reserve(mem, size);
+       real_mode_header = (struct real_mode_header *) base;
 
        printk(KERN_DEBUG "Base memory trampoline at [%p] %llx size %zu\n",
-              real_mode_base, (unsigned long long)mem, size);
+              base, (unsigned long long)mem, size);
 
-       memcpy(real_mode_base, real_mode_blob, size);
+       memcpy(base, real_mode_blob, size);
 
-       real_mode_seg = __pa(real_mode_base) >> 4;
+       real_mode_seg = __pa(base) >> 4;
        rel = (u32 *) real_mode_relocs;
 
        /* 16-bit segment relocations. */
        count = rel[0];
        rel = &rel[1];
        for (i = 0; i < count; i++) {
-               seg = (u16 *) (real_mode_base + rel[i]);
+               seg = (u16 *) (base + rel[i]);
                *seg = real_mode_seg;
        }
 
@@ -51,25 +49,21 @@ void __init setup_real_mode(void)
        count = rel[i];
        rel =  &rel[i + 1];
        for (i = 0; i < count; i++) {
-               ptr = (u32 *) (real_mode_base + rel[i]);
-               *ptr += __pa(real_mode_base);
+               ptr = (u32 *) (base + rel[i]);
+               *ptr += __pa(base);
        }
 
-       /* Copied header will contain relocated physical addresses. */
-       memcpy(&real_mode_header, real_mode_base,
-              sizeof(struct real_mode_header));
-
 #ifdef CONFIG_X86_32
-       *((u32 *)__va(real_mode_header.startup_32_smp)) = __pa(startup_32_smp);
-       *((u32 *)__va(real_mode_header.boot_gdt)) = __pa(boot_gdt);
+       *((u32 *)__va(real_mode_header->startup_32_smp)) = __pa(startup_32_smp);
+       *((u32 *)__va(real_mode_header->boot_gdt)) = __pa(boot_gdt);
 #else
-       *((u64 *) __va(real_mode_header.startup_64_smp)) =
+       *((u64 *) __va(real_mode_header->startup_64_smp)) =
                (u64)secondary_startup_64;
 
-       *((u64 *) __va(real_mode_header.level3_ident_pgt)) =
+       *((u64 *) __va(real_mode_header->level3_ident_pgt)) =
                __pa(level3_ident_pgt) + _KERNPG_TABLE;
 
-       *((u64 *) __va(real_mode_header.level3_kernel_pgt)) =
+       *((u64 *) __va(real_mode_header->level3_kernel_pgt)) =
                __pa(level3_kernel_pgt) + _KERNPG_TABLE;
 #endif
 }
@@ -82,23 +76,22 @@ void __init setup_real_mode(void)
  */
 static int __init set_real_mode_permissions(void)
 {
-       size_t all_size =
-               PAGE_ALIGN(real_mode_header.end) -
-               __pa(real_mode_base);
+       unsigned char *base = (unsigned char *) real_mode_header;
+       size_t size = PAGE_ALIGN(real_mode_blob_end - real_mode_blob);
 
        size_t ro_size =
-               PAGE_ALIGN(real_mode_header.ro_end) -
-               __pa(real_mode_base);
+               PAGE_ALIGN(real_mode_header->ro_end) -
+               __pa(base);
 
        size_t text_size =
-               PAGE_ALIGN(real_mode_header.ro_end) -
-               real_mode_header.text_start;
+               PAGE_ALIGN(real_mode_header->ro_end) -
+               real_mode_header->text_start;
 
        unsigned long text_start =
-               (unsigned long) __va(real_mode_header.text_start);
+               (unsigned long) __va(real_mode_header->text_start);
 
-       set_memory_nx((unsigned long) real_mode_base, all_size >> PAGE_SHIFT);
-       set_memory_ro((unsigned long) real_mode_base, ro_size >> PAGE_SHIFT);
+       set_memory_nx((unsigned long) base, size >> PAGE_SHIFT);
+       set_memory_ro((unsigned long) base, ro_size >> PAGE_SHIFT);
        set_memory_x((unsigned long) text_start, text_size >> PAGE_SHIFT);
 
        return 0;

diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 050eff29a4bb938bd9374503b026d8411ca59e04..658f856f09a30eb0afd3aafc842e707ca66723f0 100644 (file)
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -336,7 +336,7 @@ core_initcall(reboot_init);
 void machine_real_restart(unsigned int type)
 {
        void (*restart_lowmem)(unsigned int) = (void (*)(unsigned int))
-               real_mode_header.machine_real_restart_asm;
+               real_mode_header->machine_real_restart_asm;
 
        local_irq_disable();
 

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index c7971ea74bd0f9af64a35da298eb72a3ad72d384..b8c0661e234142102fb9a6d882aeccf97bad8f08 100644 (file)
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -665,9 +665,9 @@ static void __cpuinit announce_cpu(int cpu, int apicid)
 static int __cpuinit do_boot_cpu(int apicid, int cpu)
 {
        volatile u32 *trampoline_status =
-               (volatile u32 *) __va(real_mode_header.trampoline_status);
+               (volatile u32 *) __va(real_mode_header->trampoline_status);
        /* start_ip had better be page-aligned! */
-       unsigned long start_ip = real_mode_header.trampoline_data;
+       unsigned long start_ip = real_mode_header->trampoline_data;
 
        unsigned long boot_error = 0;
        int timeout;

diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
index c136e2325062efef49dedcdc17ecfe82d20d5a8c..65adda4fde93aac081fa502295430eebe8e470d0 100644 (file)
--- a/arch/x86/kernel/tboot.c
+++ b/arch/x86/kernel/tboot.c
@@ -202,7 +202,7 @@ static int tboot_setup_sleep(void)
        }
 
        tboot->acpi_sinfo.kernel_s3_resume_vector =
-               real_mode_header.wakeup_start;
+               real_mode_header->wakeup_start;
 
        return 0;
 }

diff --git a/arch/x86/realmode/rm/header.S b/arch/x86/realmode/rm/header.S
index a91ec8f6b15f41543952e6e015d8b3228e45f476..c83005c4d455aab7671d31f20bd20b1a899d4a00 100644 (file)
--- a/arch/x86/realmode/rm/header.S
+++ b/arch/x86/realmode/rm/header.S
@@ -12,7 +12,6 @@
 GLOBAL(real_mode_header)
                .long   pa_text_start
                .long   pa_ro_end
-               .long   pa_end
 #ifdef CONFIG_X86_32
                .long   pa_machine_real_restart_asm
 #endif

diff --git a/arch/x86/realmode/rm/realmode.lds.S b/arch/x86/realmode/rm/realmode.lds.S
index 4d4afcaf5f029fb41df3cec1225583d254af2648..86b2e8d6b1f1bdf99883c8174dd5a63841add207 100644 (file)
--- a/arch/x86/realmode/rm/realmode.lds.S
+++ b/arch/x86/realmode/rm/realmode.lds.S
@@ -65,7 +65,6 @@ SECTIONS
        .signature : {
                *(.signature)
        }
-       pa_end = .;
 
        /DISCARD/ : {
                *(.note*)

diff --git a/arch/x86/realmode/rmpiggy.S b/arch/x86/realmode/rmpiggy.S
index fd72a99d12ae42696b3244a9ab6db926fc99d6c4..204c6ece0e97640d6373206a12155356655a585c 100644 (file)
--- a/arch/x86/realmode/rmpiggy.S
+++ b/arch/x86/realmode/rmpiggy.S
@@ -13,6 +13,8 @@ GLOBAL(real_mode_blob)
        .incbin "arch/x86/realmode/rm/realmode.bin"
 END(real_mode_blob)
 
+GLOBAL(real_mode_blob_end);
+
 GLOBAL(real_mode_relocs)
        .incbin "arch/x86/realmode/rm/realmode.relocs"
 END(real_mode_relocs)

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index e77aa4a1c9f6667003a7563e836cbe2ed141827e..06139005c4dda938e1c0e78f108a097b1dcb3557 100644 (file)
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -93,7 +93,7 @@ static struct notifier_block tts_notifier = {
 static int acpi_sleep_prepare(u32 acpi_state)
 {
 #ifdef CONFIG_ACPI_SLEEP
-       unsigned long wakeup_pa = real_mode_header.wakeup_start;
+       unsigned long wakeup_pa = real_mode_header->wakeup_start;
        /* do we have a wakeup address for S2 and S3? */
        if (acpi_state == ACPI_STATE_S3) {
                if (!wakeup_pa)