From nobody Thu Mar 2 17:10:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PSHfh5r5sz3w321; Thu, 2 Mar 2023 17:10:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PSHfh5N1Lz3C53; Thu, 2 Mar 2023 17:10:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677777020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KRnLz4f9rpgfGSjk28CklZoTqMBeJp/pimiM3+AnbbA=; b=QX7AXqQApnO/D/RWc3e/jPP5Toiev4nKBIpGXh+D49Uy54QnUUKcOSsrbuDb5Fq2g83ZGT 8vY32w69oEVZs9IBSjSG2jFEohZ2+SnkYmVs/IgAtikDXlCkjlbiO4mX94cK4E7kOQiM/B enE1Xa17qWzT2HIUEbUezX24WTQvwTocvVvFjcMIUn7je5jxTM65TYXMB5gPuYEC/WH3/4 SZTgdMWuP+OyoEtQnIRuGbaan0Ju+1yaAxF7R4KGEMdyPKYYTi1QbKSnYWWMBBNhFf0oZJ i1+/5gjSGyt7+Q6dX2htb/s60le6peQdbN8kikS3fD3tC/gVWW0IvXpMH+hBEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677777020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KRnLz4f9rpgfGSjk28CklZoTqMBeJp/pimiM3+AnbbA=; b=pk0GPwyB/euZxmMy3VKSAUBiImmOdIywmSuqIrRx/mpmdRa1cZ6i9MSV2zf0NBnIAlS8H4 Cx/MyvYy5Iq/OoeHDgVW96qtxQFqOaEgcKlWzaVEtABcfOn6fhDIN2MWsLuZhinzKuVUsw T2vMS0GuhnitfpGY6EQqwocEJm/g9LqOjpXnwyWL5MepjNc7l77DO7InGtNr9RHmWJbTLM 0jXldeA8bcL/vhzLuKbdM2z7gUyZC2G9/qZGXULZJG3bDXaskAg6FHdxo2wMSI6ZZ3H1Fi TMEX7dRYVPHFt7jB4d++SPbrtFYV8gJdSPvbiJOAIOxJtWOw5KlIQxt8hAnGUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677777020; a=rsa-sha256; cv=none; b=KmdfTP3fvjv59uR9dzV4+/ARQFTSJInOJM1iwintNjx3Uijk7xG0GYblwAr0S9sI0GAct3 JcERbzptjP+1mz39o5LFP9WyGaKES1S/KgS3JcqEjXC2qhUFQcz7AxPXPFHcsQ1+AyB2t9 g2aDx8oEokMCif76H9Mj+Dd5AtLDrTYRuqtcDMnXfmaG713iILiTkfsa7RQhYyNkSUVfFe LEA5S5DF3YUyQlobbsLZxRmWuFiy7y0kP56zXDIiuhHDi9xcE15ESEsdHh3lddUpLrc7Px hH6z30AtLBkXO113rqbtlB39h3dikR8v+Cju34Z+GZp6Hpf/xmRhakxpC9Cwug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSHfh4TbVzNyL; Thu, 2 Mar 2023 17:10:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 322HAK1G028230; Thu, 2 Mar 2023 17:10:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322HAKf0028229; Thu, 2 Mar 2023 17:10:20 GMT (envelope-from git) Date: Thu, 2 Mar 2023 17:10:20 GMT Message-Id: <202303021710.322HAKf0028229@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 55639067a29b - releng/13.2 - apic: prevent divide by zero in CPU frequency init List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 55639067a29b1250f7ba7dfc012723a843c5f91c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=55639067a29b1250f7ba7dfc012723a843c5f91c commit 55639067a29b1250f7ba7dfc012723a843c5f91c Author: Mina Galić AuthorDate: 2023-02-28 02:58:45 +0000 Commit: Warner Losh CommitDate: 2023-03-02 17:09:47 +0000 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) --- sys/x86/x86/local_apic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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