lkml.org 
[lkml]   [2005]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patches in this message
    /
    Date
    From
    Subject[PATCH] adjust x86-64 watchdog tick calculation
    (Note: Patch also attached because the inline version is certain to get
    line wrapped.)

    Get the x86-64 watchdog tick calculation into a state where it can also
    be used with nmi_hz other than 1Hz. Also do not turn on the watchdog by
    default (as is already done on i386).

    Signed-off-by: Jan Beulich <jbeulich@novell.com>

    diff -Npru linux-2.6.12-rc4.base/arch/x86_64/kernel/nmi.c linux-2.6.12-rc4/arch/x86_64/kernel/nmi.c
    --- linux-2.6.12-rc4.base/arch/x86_64/kernel/nmi.c 2005-05-11 17:27:54.848855552 +0200
    +++ linux-2.6.12-rc4/arch/x86_64/kernel/nmi.c 2005-05-11 17:50:36.257889920 +0200
    @@ -57,7 +57,7 @@ static unsigned int lapic_nmi_owner;
    int nmi_active; /* oprofile uses this */
    int panic_on_timeout;

    -unsigned int nmi_watchdog = NMI_DEFAULT;
    +unsigned int nmi_watchdog = NMI_NONE;
    static unsigned int nmi_hz = HZ;
    unsigned int nmi_perfctr_msr; /* the MSR to reset in NMI handler */

    @@ -325,7 +325,7 @@ static void setup_k7_watchdog(void)
    | K7_NMI_EVENT;

    wrmsr(MSR_K7_EVNTSEL0, evntsel, 0);
    - wrmsrl(MSR_K7_PERFCTR0, -((u64)cpu_khz*1000) / nmi_hz);
    + wrmsrl(MSR_K7_PERFCTR0, -((u64)cpu_khz * 1000 / nmi_hz));
    apic_write(APIC_LVTPC, APIC_DM_NMI);
    evntsel |= K7_EVNTSEL_ENABLE;
    wrmsr(MSR_K7_EVNTSEL0, evntsel, 0);
    @@ -404,7 +404,7 @@ void nmi_watchdog_tick (struct pt_regs *
    alert_counter[cpu] = 0;
    }
    if (nmi_perfctr_msr)
    - wrmsr(nmi_perfctr_msr, -(cpu_khz/nmi_hz*1000), -1);
    + wrmsrl(nmi_perfctr_msr, -((u64)cpu_khz * 1000 / nmi_hz));
    }

    static int dummy_nmi_callback(struct pt_regs * regs, int cpu)

    (Note: Patch also attached because the inline version is certain to get
    line wrapped.)

    Get the x86-64 watchdog tick calculation into a state where it can also
    be used with nmi_hz other than 1Hz. Also do not turn on the watchdog by
    default (as is already done on i386).

    Signed-off-by: Jan Beulich <jbeulich@novell.com>

    diff -Npru linux-2.6.12-rc4.base/arch/x86_64/kernel/nmi.c linux-2.6.12-rc4/arch/x86_64/kernel/nmi.c
    --- linux-2.6.12-rc4.base/arch/x86_64/kernel/nmi.c 2005-05-11 17:27:54.848855552 +0200
    +++ linux-2.6.12-rc4/arch/x86_64/kernel/nmi.c 2005-05-11 17:50:36.257889920 +0200
    @@ -57,7 +57,7 @@ static unsigned int lapic_nmi_owner;
    int nmi_active; /* oprofile uses this */
    int panic_on_timeout;

    -unsigned int nmi_watchdog = NMI_DEFAULT;
    +unsigned int nmi_watchdog = NMI_NONE;
    static unsigned int nmi_hz = HZ;
    unsigned int nmi_perfctr_msr; /* the MSR to reset in NMI handler */

    @@ -325,7 +325,7 @@ static void setup_k7_watchdog(void)
    | K7_NMI_EVENT;

    wrmsr(MSR_K7_EVNTSEL0, evntsel, 0);
    - wrmsrl(MSR_K7_PERFCTR0, -((u64)cpu_khz*1000) / nmi_hz);
    + wrmsrl(MSR_K7_PERFCTR0, -((u64)cpu_khz * 1000 / nmi_hz));
    apic_write(APIC_LVTPC, APIC_DM_NMI);
    evntsel |= K7_EVNTSEL_ENABLE;
    wrmsr(MSR_K7_EVNTSEL0, evntsel, 0);
    @@ -404,7 +404,7 @@ void nmi_watchdog_tick (struct pt_regs *
    alert_counter[cpu] = 0;
    }
    if (nmi_perfctr_msr)
    - wrmsr(nmi_perfctr_msr, -(cpu_khz/nmi_hz*1000), -1);
    + wrmsrl(nmi_perfctr_msr, -((u64)cpu_khz * 1000 / nmi_hz));
    }

    static int dummy_nmi_callback(struct pt_regs * regs, int cpu)
    \
     
     \ /
      Last update: 2005-05-12 10:30    [W:2.359 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site