lkml.org 
[lkml]   [2013]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 08/20] x86, ACPI: Find acpi tables in initrd early from head_32.S/head64.c
    Date
    head64.c could use #PF handler set page table to access initrd before
    init mem mapping and initrd relocating.

    head_32.S could use 32bit flat mode to access initrd before init mem
    mapping initrd relocating.

    That make 32bit and 64 bit more consistent.

    -v2: use inline function in header file instead according to tj.
    also still need to keep #idef head_32.S to avoid compiling error.

    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    Cc: Pekka Enberg <penberg@kernel.org>
    Cc: Jacob Shin <jacob.shin@amd.com>
    Cc: Rafael J. Wysocki <rjw@sisk.pl>
    Cc: linux-acpi@vger.kernel.org
    ---
    arch/x86/include/asm/setup.h | 6 ++++++
    arch/x86/kernel/head64.c | 2 ++
    arch/x86/kernel/head_32.S | 4 ++++
    arch/x86/kernel/setup.c | 30 ++++++++++++++++++++++++++++--
    4 files changed, 40 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h
    index 4f71d48..6f885b7 100644
    --- a/arch/x86/include/asm/setup.h
    +++ b/arch/x86/include/asm/setup.h
    @@ -42,6 +42,12 @@ extern void visws_early_detect(void);
    static inline void visws_early_detect(void) { }
    #endif

    +#ifdef CONFIG_ACPI_INITRD_TABLE_OVERRIDE
    +void x86_acpi_override_find(void);
    +#else
    +static inline void x86_acpi_override_find(void) { }
    +#endif
    +
    extern unsigned long saved_video_mode;

    extern void reserve_standard_io_resources(void);
    diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
    index c5e403f..a31bc63 100644
    --- a/arch/x86/kernel/head64.c
    +++ b/arch/x86/kernel/head64.c
    @@ -174,6 +174,8 @@ void __init x86_64_start_kernel(char * real_mode_data)
    if (console_loglevel == 10)
    early_printk("Kernel alive\n");

    + x86_acpi_override_find();
    +
    clear_page(init_level4_pgt);
    /* set init_level4_pgt kernel high mapping*/
    init_level4_pgt[511] = early_level4_pgt[511];
    diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
    index 73afd11..ca08f0e 100644
    --- a/arch/x86/kernel/head_32.S
    +++ b/arch/x86/kernel/head_32.S
    @@ -149,6 +149,10 @@ ENTRY(startup_32)
    call load_ucode_bsp
    #endif

    +#ifdef CONFIG_ACPI_INITRD_TABLE_OVERRIDE
    + call x86_acpi_override_find
    +#endif
    +
    /*
    * Initialize page tables. This creates a PDE and a set of page
    * tables, which are located immediately beyond __brk_base. The variable
    diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
    index 16a703f..b067663 100644
    --- a/arch/x86/kernel/setup.c
    +++ b/arch/x86/kernel/setup.c
    @@ -424,6 +424,34 @@ static void __init reserve_initrd(void)
    }
    #endif /* CONFIG_BLK_DEV_INITRD */

    +#ifdef CONFIG_ACPI_INITRD_TABLE_OVERRIDE
    +void __init x86_acpi_override_find(void)
    +{
    + unsigned long ramdisk_image, ramdisk_size;
    + unsigned char *p = NULL;
    +
    +#ifdef CONFIG_X86_32
    + struct boot_params *boot_params_p;
    +
    + /*
    + * 32bit is from head_32.S, and it is 32bit flat mode.
    + * So need to use phys address to access global variables.
    + */
    + boot_params_p = (struct boot_params *)__pa_symbol(&boot_params);
    + ramdisk_image = get_ramdisk_image(boot_params_p);
    + ramdisk_size = get_ramdisk_size(boot_params_p);
    + p = (unsigned char *)ramdisk_image;
    + acpi_initrd_override_find(p, ramdisk_size, true);
    +#else
    + ramdisk_image = get_ramdisk_image(&boot_params);
    + ramdisk_size = get_ramdisk_size(&boot_params);
    + if (ramdisk_image)
    + p = __va(ramdisk_image);
    + acpi_initrd_override_find(p, ramdisk_size, false);
    +#endif
    +}
    +#endif
    +
    static void __init parse_setup_data(void)
    {
    struct setup_data *data;
    @@ -1092,8 +1120,6 @@ void __init setup_arch(char **cmdline_p)

    reserve_initrd();

    - acpi_initrd_override_find((void *)initrd_start,
    - initrd_end - initrd_start, false);
    acpi_initrd_override_copy();

    reserve_crashkernel();
    --
    1.7.10.4


    \
     
     \ /
      Last update: 2013-03-10 08:42    [W:4.238 / U:26.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site