From nobody Sat Feb 25 16:53:40 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 4PPCWm3BhMz3tcts; Sat, 25 Feb 2023 16:53:40 +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 4PPCWm2d90z3l2C; Sat, 25 Feb 2023 16:53:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677344020; 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=X5IckCRRrC+xUsAhnAGaUrNO6kgtsdt9D2Rz3GiVNlw=; b=i1sYfByiZkQADhhGaiN0Q6indvXgh7PFQztn/ckFdHajchuUg49sDydxoPYkso/JDbEGUA lqb8GoHU/jIuVEfXBLbWTjaPZKir+qFxMBF0PpyuMj7VPvHvURV/rmI3L/KXyUXul1xMrr U0moKabFJ4rUuS3bMLemaf91oBCxU0g2uC4DqsgvnECMQT1kuGGqDk4OGdsiyLqnSFWrgH yBxSZgeteLmmCUqzobulPOefpx1eOLecPJ+POe/Pzc6a38jhNVZ0Qe9o5gkfRUnMhMpRUU 3YUUb+FPTY6fJyJguJvRcAN79GZYunuKr/4R2FVxB3PvJ2eNdPQwmpwuiVXTog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677344020; 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=X5IckCRRrC+xUsAhnAGaUrNO6kgtsdt9D2Rz3GiVNlw=; b=q8zHKi3JmTQUvKpK2EdN1VdCqpq3DfQST24FtANz1fEVLGu2y+u3YwgPbLgOpgcNJMwpSB TSdafu/yzdLImJ29cvxmg3sAOSJ5qruXV76munxzMVtQiia3R5oIZ7eBGaGStngpbxwPQL qqsNWb6H7fed0FkPRaabwl7oqMFFh6fgB7AYIGob3z76LP4HkCIlFnpu1uosH0NX3yvcBT Hb8Kp8uztVL/KIPnwIJhg1hdL+YqmMp8a24C6y5BBZv+aCxcu/HR0j0fkAocbYawwokvjk Ab0GtxzCwcWgLMrxLqOmlD4pPllnA349gxspUgi6FNbO+Xlz8Zp5dqiSPbAhFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677344020; a=rsa-sha256; cv=none; b=A+rcixoGd1OB7RWZH2Xaq3xFxCWa5d1VWUXSQoah35ZDX7X9MRQAUvrTur+bPPWH0Sk1ZZ DV9vE0NKSYSdj086JnKHClN0yKrbEsVIsmBu3rbW16QzCMFopQMS4zaBth5WMm+Nj8zaPV WTsClUfQWsSbPnyveP/u6PSnBRXXjKD4qZ9ZDqp+qGfj1ACQglq2un15JLjFa0t7C9PySx 0RD9d7AdrBFqf2qFk6o2SveiFobY65YHWhWS1UnWb/xDB2mMUlNSdvBXe21NafOal7i7KV tDdE8jgsBGOBqJeTGTpO9AhE1KmKvuOtSCYzAlr9bkQDvWjQMWz6qeKpB4N7Pw== 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 4PPCWm1hjvz1BVv; Sat, 25 Feb 2023 16:53:40 +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 31PGreDl007689; Sat, 25 Feb 2023 16:53:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31PGregX007688; Sat, 25 Feb 2023 16:53:40 GMT (envelope-from git) Date: Sat, 25 Feb 2023 16:53:40 GMT Message-Id: <202302251653.31PGregX007688@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 499171a98c88 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 499171a98c8813e4dc6e085461d5c47750efa555 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=499171a98c8813e4dc6e085461d5c47750efa555 commit 499171a98c8813e4dc6e085461d5c47750efa555 Author: Mina Galić AuthorDate: 2023-02-24 11:07:42 +0000 Commit: Warner Losh CommitDate: 2023-02-25 16:47:40 +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 --- 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 609635bdad3d..22392901b731 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -953,7 +953,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