Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42ac8ff2 authored by Jan Beulich's avatar Jan Beulich Committed by Linus Torvalds
Browse files

[PATCH] x86_64: NMI watchdog frequency calculation adjustments 



Like previously done for i386, get the x86_64 watchdog tick calculation
into a state where it can also be used on CPUs with frequencies beyond
4GHz.

Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
Acked-by: default avatarAndi Kleen <ak@muc.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 33bf5610

arch/x86_64/kernel/nmi.c

+4 −4
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ static void setup_k7_watchdog(void) 
		| K7_NMI_EVENT;



	wrmsr(MSR_K7_EVNTSEL0, evntsel, 0);

	wrmsr(MSR_K7_PERFCTR0, -(cpu_khz/nmi_hz*1000), -1);

	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);
@@ -407,8 +407,8 @@ static int setup_p4_watchdog(void) 


	wrmsr(MSR_P4_CRU_ESCR0, P4_NMI_CRU_ESCR0, 0);

	wrmsr(MSR_P4_IQ_CCCR0, P4_NMI_IQ_CCCR0 & ~P4_CCCR_ENABLE, 0);

	Dprintk("setting P4_IQ_COUNTER0 to 0x%08lx\n", -(cpu_khz/nmi_hz*1000));

	wrmsr(MSR_P4_IQ_COUNTER0, -(cpu_khz/nmi_hz*1000), -1);

	Dprintk("setting P4_IQ_COUNTER0 to 0x%08lx\n", -(cpu_khz * 1000UL / nmi_hz));

	wrmsrl(MSR_P4_IQ_COUNTER0, -((u64)cpu_khz * 1000 / nmi_hz));

	apic_write(APIC_LVTPC, APIC_DM_NMI);

	wrmsr(MSR_P4_IQ_CCCR0, nmi_p4_cccr_val, 0);

	return 1;
@@ -506,7 +506,7 @@ void nmi_watchdog_tick (struct pt_regs * regs, unsigned reason) 
 			wrmsr(MSR_P4_IQ_CCCR0, nmi_p4_cccr_val, 0);

 			apic_write(APIC_LVTPC, APIC_DM_NMI);

 		}

		wrmsr(nmi_perfctr_msr, -(cpu_khz/nmi_hz*1000), -1);

		wrmsrl(nmi_perfctr_msr, -((u64)cpu_khz * 1000 / nmi_hz));

	}

}