diff options
| author | Mina Galić <freebsd@igalic.co> | 2023-02-28 02:58:45 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2023-03-02 17:09:47 +0000 |
| commit | 55639067a29b1250f7ba7dfc012723a843c5f91c (patch) | |
| tree | 747f733f163796cd99f4f6271cf071eaa79e3b38 | |
| parent | 572900bd93fdbbc2b42f0ad7374f390d8dd54de8 (diff) | |
| download | src-55639067a29b1250f7ba7dfc012723a843c5f91c.tar.gz src-55639067a29b1250f7ba7dfc012723a843c5f91c.zip | |
apic: prevent divide by zero in CPU frequency init
If a CPU for some reason returns 0 as CPU frequency, we currently panic
on the resulting divide by zero when trying to initialize the CPU(s) via
APIC. When this happens, we'll fallback to measuring the frequency
instead.
PR: 269767
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/664
Approved by: re@ (cperciva)
(cherry picked from commit 499171a98c8813e4dc6e085461d5c47750efa555)
(cherry picked from commit a1c63b8e29e832d9ada7c252e7e80ce8b94aeb41)
| -rw-r--r-- | sys/x86/x86/local_apic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index 4ab4e78f20e7..482b0ebd81bc 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -1027,7 +1027,7 @@ lapic_calibrate_initcount_cpuid_vm(void) /* Record divided frequency. */ count_freq = freq / lapic_timer_divisor; - return (true); + return (count_freq != 0); } static uint64_t |