lkml.org 
[lkml]   [2023]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[patch V2 14/58] x86/apic: Split register_apic_address()
    Date
    Split the fixmap setup out of register_lapic_address() and reuse it when
    the X2APIC is disabled during setup.

    This avoids that the APIC ID is registered twice.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    ---
    arch/x86/kernel/apic/apic.c | 22 ++++++++++++++--------
    1 file changed, 14 insertions(+), 8 deletions(-)

    --- a/arch/x86/kernel/apic/apic.c
    +++ b/arch/x86/kernel/apic/apic.c
    @@ -1852,6 +1852,8 @@ void x2apic_setup(void)
    __x2apic_enable();
    }

    +static __init void apic_set_fixmap(void);
    +
    static __init void x2apic_disable(void)
    {
    u32 x2apic_id, state = x2apic_state;
    @@ -1872,7 +1874,7 @@ static __init void x2apic_disable(void)
    }

    __x2apic_disable();
    - register_lapic_address(mp_lapic_addr);
    + apic_set_fixmap();
    }

    static __init void x2apic_enable(void)
    @@ -2145,17 +2147,21 @@ void __init init_apic_mappings(void)
    }
    }

    +static __init void apic_set_fixmap(void)
    +{
    + set_fixmap_nocache(FIX_APIC_BASE, mp_lapic_addr);
    + apic_mmio_base = APIC_BASE;
    + apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n",
    + apic_mmio_base, mp_lapic_addr);
    + apic_read_boot_cpu_id(false);
    +}
    +
    void __init register_lapic_address(unsigned long address)
    {
    mp_lapic_addr = address;

    - if (x2apic_mode)
    - return;
    -
    - set_fixmap_nocache(FIX_APIC_BASE, address);
    - apic_mmio_base = APIC_BASE;
    - apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n", APIC_BASE, address);
    - apic_read_boot_cpu_id(false);
    + if (!x2apic_mode)
    + apic_set_fixmap();
    }

    /*
    \
     
     \ /
      Last update: 2023-07-24 15:37    [W:4.050 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site