lkml.org 
[lkml]   [2010]   [Mar]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/core] x86, apic: Allow to use certain functions without APIC built-in support
    Commit-ID:  d674cd1963129b70bc5f631c51fb30fb73213fb2
    Gitweb: http://git.kernel.org/tip/d674cd1963129b70bc5f631c51fb30fb73213fb2
    Author: Cyrill Gorcunov <gorcunov@openvz.org>
    AuthorDate: Wed, 17 Mar 2010 13:37:00 +0300
    Committer: Ingo Molnar <mingo@elte.hu>
    CommitDate: Thu, 18 Mar 2010 17:03:21 +0100

    x86, apic: Allow to use certain functions without APIC built-in support

    In case even if the kernel is configured so that
    no APIC support is built-in we still may allow
    to use certain apic functions as dummy calls.

    In particular we start using it in perf-events code.

    Note that this is not that same as NOOP apic driver (which
    is used if APIC support is present but no physical APIC is
    available), this is for the case when we don't have apic code
    compiled in at all.

    Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
    Cc: H. Peter Anvin <hpa@zytor.com>
    Cc: Yinghai Lu <yinghai@kernel.org>
    Cc: Yinghai Lu <yinghai@kernel.org>
    LKML-Reference: <20100317104356.011052632@openvz.org>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    ---
    arch/x86/include/asm/apic.h | 13 +++++++++++--
    1 files changed, 11 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
    index b4ac2cd..1fa03e0 100644
    --- a/arch/x86/include/asm/apic.h
    +++ b/arch/x86/include/asm/apic.h
    @@ -373,6 +373,7 @@ extern atomic_t init_deasserted;
    extern int wakeup_secondary_cpu_via_nmi(int apicid, unsigned long start_eip);
    #endif

    +#ifdef CONFIG_X86_LOCAL_APIC
    static inline u32 apic_read(u32 reg)
    {
    return apic->read(reg);
    @@ -403,10 +404,19 @@ static inline u32 safe_apic_wait_icr_idle(void)
    return apic->safe_wait_icr_idle();
    }

    +#else /* CONFIG_X86_LOCAL_APIC */
    +
    +static inline u32 apic_read(u32 reg) { return 0; }
    +static inline void apic_write(u32 reg, u32 val) { }
    +static inline u64 apic_icr_read(void) { return 0; }
    +static inline void apic_icr_write(u32 low, u32 high) { }
    +static inline void apic_wait_icr_idle(void) { }
    +static inline u32 safe_apic_wait_icr_idle(void) { return 0; }
    +
    +#endif /* CONFIG_X86_LOCAL_APIC */

    static inline void ack_APIC_irq(void)
    {
    -#ifdef CONFIG_X86_LOCAL_APIC
    /*
    * ack_APIC_irq() actually gets compiled as a single instruction
    * ... yummie.
    @@ -414,7 +424,6 @@ static inline void ack_APIC_irq(void)

    /* Docs say use 0 for future compatibility */
    apic_write(APIC_EOI, 0);
    -#endif
    }

    static inline unsigned default_get_apic_id(unsigned long x)

    \
     
     \ /
      Last update: 2010-03-18 18:41    [W:0.024 / U:29.972 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site