lkml.org 
[lkml]   [2009]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patches in this message
    /
    Date
    From
    Subject[PATCH] x86: ioremap mptable -v2

    Impact: fix boot with mptable above max_low_mapped

    try to use early_ioremap it.

    v2: also get the exact size for reserve_bootmem in case we got big size than 4k

    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    Reported-and-tested-by: Kevin O'Connor <kevin@koconnor.net>

    ---
    arch/x86/kernel/mpparse.c | 20 ++++++++++++++++++--
    1 file changed, 18 insertions(+), 2 deletions(-)

    Index: linux-2.6/arch/x86/kernel/mpparse.c
    ===================================================================
    --- linux-2.6.orig/arch/x86/kernel/mpparse.c
    +++ linux-2.6/arch/x86/kernel/mpparse.c
    @@ -611,12 +611,20 @@ static void __init __get_smp_config(unsi
    construct_default_ISA_mptable(mpf->feature1);

    } else if (mpf->physptr) {
    + struct mpc_table *mpc;
    + unsigned long size;

    + mpc = early_ioremap(mpf->physptr, PAGE_SIZE);
    + size = mpc->length;
    + apic_printk(APIC_VERBOSE, " mpc: %lx-%lx\n", (unsigned long)mpf->physptr,
    + mpf->physptr + size);
    + early_iounmap(mpc, PAGE_SIZE);
    + mpc = early_ioremap(mpf->physptr, size);
    /*
    * Read the physical hardware table. Anything here will
    * override the defaults.
    */
    - if (!smp_read_mpc(phys_to_virt(mpf->physptr), early)) {
    + if (!smp_read_mpc(mpc, early)) {
    #ifdef CONFIG_X86_LOCAL_APIC
    smp_found_config = 0;
    #endif
    @@ -624,9 +632,12 @@ static void __init __get_smp_config(unsi
    "BIOS bug, MP table errors detected!...\n");
    printk(KERN_ERR "... disabling SMP support. "
    "(tell your hw vendor)\n");
    + early_iounmap(mpc, size);
    return;
    }

    + early_iounmap(mpc, size);
    +
    if (early)
    return;
    #ifdef CONFIG_X86_IO_APIC
    @@ -700,7 +711,12 @@ static int __init smp_scan_config(unsign
    reserve_bootmem_generic(virt_to_phys(mpf), PAGE_SIZE,
    BOOTMEM_DEFAULT);
    if (mpf->physptr) {
    - unsigned long size = PAGE_SIZE;
    + struct mpc_table *mpc;
    + unsigned long size;
    +
    + mpc = early_ioremap(mpf->physptr, PAGE_SIZE);
    + size = mpc->length;
    + early_iounmap(mpc, PAGE_SIZE);
    #ifdef CONFIG_X86_32
    /*
    * We cannot access to MPC table to compute[PATCH] x86: ioremap mptable -v2
    Impact: fix boot with mptable above max_low_mapped

    try to use early_ioremap it.

    v2: also get the exact size for reserve_bootmem in case we got big size than 4k

    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    Reported-and-tested-by: Kevin O'Connor <kevin@koconnor.net>

    ---
    arch/x86/kernel/mpparse.c | 20 ++++++++++++++++++--
    1 file changed, 18 insertions(+), 2 deletions(-)
    Index: linux-2.6/arch/x86/kernel/mpparse.c
    ===================================================================
    --- linux-2.6.orig/arch/x86/kernel/mpparse.c
    +++ linux-2.6/arch/x86/kernel/mpparse.c
    @@ -611,12 +611,20 @@ static void __init __get_smp_config(unsi
    construct_default_ISA_mptable(mpf->feature1);

    } else if (mpf->physptr) {
    + struct mpc_table *mpc;
    + unsigned long size;

    + mpc = early_ioremap(mpf->physptr, PAGE_SIZE);
    + size = mpc->length;
    + apic_printk(APIC_VERBOSE, " mpc: %lx-%lx\n", (unsigned long)mpf->physptr,
    + mpf->physptr + size);
    + early_iounmap(mpc, PAGE_SIZE);
    + mpc = early_ioremap(mpf->physptr, size);
    /*
    * Read the physical hardware table. Anything here will
    * override the defaults.
    */
    - if (!smp_read_mpc(phys_to_virt(mpf->physptr), early)) {
    + if (!smp_read_mpc(mpc, early)) {
    #ifdef CONFIG_X86_LOCAL_APIC
    smp_found_config = 0;
    #endif
    @@ -624,9 +632,12 @@ static void __init __get_smp_config(unsi
    "BIOS bug, MP table errors detected!...\n");
    printk(KERN_ERR "... disabling SMP support. "
    "(tell your hw vendor)\n");
    + early_iounmap(mpc, size);
    return;
    }

    + early_iounmap(mpc, size);
    +
    if (early)
    return;
    #ifdef CONFIG_X86_IO_APIC
    @@ -700,7 +711,12 @@ static int __init smp_scan_config(unsign
    reserve_bootmem_generic(virt_to_phys(mpf), PAGE_SIZE,
    BOOTMEM_DEFAULT);
    if (mpf->physptr) {
    - unsigned long size = PAGE_SIZE;
    + struct mpc_table *mpc;
    + unsigned long size;
    +
    + mpc = early_ioremap(mpf->physptr, PAGE_SIZE);
    + size = mpc->length;
    + early_iounmap(mpc, PAGE_SIZE);
    #ifdef CONFIG_X86_32
    /*
    * We cannot access to MPC table to compute

    \
     
     \ /
      Last update: 2009-03-02 04:27    [W:0.027 / U:0.400 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site