lkml.org 
[lkml]   [2008]   [Aug]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 7/9] x86: apic - unify __setup_APIC_LVTT
    Date
    Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
    ---
    arch/x86/kernel/apic_32.c | 10 +++++++---
    arch/x86/kernel/apic_64.c | 12 ++++++++----
    2 files changed, 15 insertions(+), 7 deletions(-)

    diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
    index 3c1562a..65419c7 100644
    --- a/arch/x86/kernel/apic_32.c
    +++ b/arch/x86/kernel/apic_32.c
    @@ -248,8 +248,12 @@ int lapic_get_maxlvt(void)
    * Local APIC timer
    */

    -/* Clock divisor is set to 16 */
    +/* Clock divisor */
    +#ifdef CONFG_X86_64
    +#define APIC_DIVISOR 1
    +#else
    #define APIC_DIVISOR 16
    +#endif

    /*
    * This function sets up the local APIC timer, with a timeout of
    @@ -281,8 +285,8 @@ static void __setup_APIC_LVTT(unsigned int clocks, int oneshot, int irqen)
    */
    tmp_value = apic_read(APIC_TDCR);
    apic_write(APIC_TDCR,
    - (tmp_value & ~(APIC_TDR_DIV_1 | APIC_TDR_DIV_TMBASE)) |
    - APIC_TDR_DIV_16);
    + (tmp_value & ~(APIC_TDR_DIV_1 | APIC_TDR_DIV_TMBASE)) |
    + APIC_TDR_DIV_16);

    if (!oneshot)
    apic_write(APIC_TMICT, clocks / APIC_DIVISOR);
    diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
    index e03a76d..a814612 100644
    --- a/arch/x86/kernel/apic_64.c
    +++ b/arch/x86/kernel/apic_64.c
    @@ -259,8 +259,12 @@ int lapic_get_maxlvt(void)
    * Local APIC timer
    */

    -/* Clock divisor is set to 1 */
    +/* Clock divisor */
    +#ifdef CONFG_X86_64
    #define APIC_DIVISOR 1
    +#else
    +#define APIC_DIVISOR 16
    +#endif

    /*
    * This function sets up the local APIC timer, with a timeout of
    @@ -291,9 +295,9 @@ static void __setup_APIC_LVTT(unsigned int clocks, int oneshot, int irqen)
    * Divide PICLK by 16
    */
    tmp_value = apic_read(APIC_TDCR);
    - apic_write(APIC_TDCR, (tmp_value
    - & ~(APIC_TDR_DIV_1 | APIC_TDR_DIV_TMBASE))
    - | APIC_TDR_DIV_16);
    + apic_write(APIC_TDCR,
    + (tmp_value & ~(APIC_TDR_DIV_1 | APIC_TDR_DIV_TMBASE)) |
    + APIC_TDR_DIV_16);

    if (!oneshot)
    apic_write(APIC_TMICT, clocks / APIC_DIVISOR);
    --
    1.6.0.rc1.34.g0fe8c


    \
     
     \ /
      Last update: 2008-08-17 21:45    [W:0.041 / U:0.128 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site