From nobody Fri Apr 08 16:10:26 2022 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 AD7F112BAA7E; Fri, 8 Apr 2022 16:10:27 +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 4KZjrz2JBXz4qcW; Fri, 8 Apr 2022 16:10:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649434227; 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=aPtIL2kYeLaL1B9KK48KXsc/n3qzYfcmlaNG+i2C+3U=; b=wq7SX3fvjE4tKjHUtt4/fxyx2jGzeaDPYqXtxDjdeGQ4k7cT1Iy8sqZ5bdt4Z1v4Plh4eD v1sSc2rJ16HWqv1RUK5mbzIr03O9iYgd7tmfeVWlG3smx//n4gvnRYu7N+ZD+GhccwFWVi E3YYkzi5wW22fcqb2W9niieWqQ4atnt4b2R/Y0HSE6DoXeb/3wqJBHvrleSjYA+k0lZT0G 8rlH+oN1owpDzRIgjU1zqcy9BR5wrCUWtrENQd04fk+APleesJKgkG50Un8iy04l7jAy2v R7kxDQLhhq6YOnmnLdU2jsqej6NYf2x2szU88VoZ3wWfBUMZU5ElM1bHKOth7A== 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 19F5696; Fri, 8 Apr 2022 16:10:27 +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 238GAQ0A092139; Fri, 8 Apr 2022 16:10:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 238GAQE6092138; Fri, 8 Apr 2022 16:10:26 GMT (envelope-from git) Date: Fri, 8 Apr 2022 16:10:26 GMT Message-Id: <202204081610.238GAQE6092138@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: aa597d4049ff - main - i386: Fix the nodevice apic build 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa597d4049ffee69d413ea2154f4b312ffbaf646 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649434227; 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=aPtIL2kYeLaL1B9KK48KXsc/n3qzYfcmlaNG+i2C+3U=; b=H4H9GMcjk2bBF1HpFapN2SkClxrKvECWJ76InXKnS9qtAuML1a74icPELwbFiaO6cCyh3t fWNHf6osMzxb86X8jv2M0WpVuKXqJcUdqgmL4WC/anY7PhjragMhPfzXHWYN0NOLzsMBbe i42IGSKFJ91zRAjFpzo5PSiApE+Wi8l95B4FAEmXBCIAYzZ5GqdFXWXQC7d29WGRF1EDMv f9w/85Ovip1p7liFz5hv0cMhP6RocqP/OuWSrspy2m8Xs11qeZfHJ0b/vLaGacuxgOQePF qxaROu/P/AR/wMDqTzE3heRDxvb9b0SB1nTENDWqAHajAU+6NPiHbSSPDYKAPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649434227; a=rsa-sha256; cv=none; b=HIgDZXQWfWiFZ7Kmvb5UknDS0RROvd/1CjUJ1aXm6qD+N90xqGl7FFm+vH9i9bzYdjBIN7 YxEEVTyR+aLWr6FsqX4DeVlGMnqfcTAXQ/oXIG1ktrD/Ln7skb+D6KEyXq9UigdBB8KUVA rQhElVAoLfO0Vpk4bdO/D5rwPJQVtBDs4HIhnUTtbMIVOLLZMwwxH6FDVrvyPY9l7aH5Q3 r0/7ozYIhadPuvECKF68P9EdUHuzCbi/K8OvjewWPJmiNl1paVTn2VfVFKDJIHyBOE2sIW muXuAlpaBYl+KsIfGLZ6CE5tsuWvsrbSNTQFkg85x3HGGqIlO73f67R3Fe9X6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=aa597d4049ffee69d413ea2154f4b312ffbaf646 commit aa597d4049ffee69d413ea2154f4b312ffbaf646 Author: Mark Johnston AuthorDate: 2022-04-08 15:47:52 +0000 Commit: Mark Johnston CommitDate: 2022-04-08 15:47:52 +0000 i386: Fix the nodevice apic build PR: 263124 Fixes: 62d09b46ad75 ("x86: Defer LAPIC calibration until after timecounters are available") Reviewed by: kib, jhb, emaste MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34830 --- sys/x86/isa/clock.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/x86/isa/clock.c b/sys/x86/isa/clock.c index 730aee5e9a2a..cb869070845f 100644 --- a/sys/x86/isa/clock.c +++ b/sys/x86/isa/clock.c @@ -42,6 +42,11 @@ __FBSDID("$FreeBSD$"); * Routines to handle clock hardware. */ +#ifdef __amd64__ +#define DEV_APIC +#else +#include "opt_apic.h" +#endif #include "opt_clock.h" #include "opt_isa.h" @@ -415,7 +420,9 @@ cpu_initclocks(void) td = curthread; tsc_calibrate(); +#ifdef DEV_APIC lapic_calibrate_timer(); +#endif cpu_initclocks_bsp(); CPU_FOREACH(i) { if (i == 0) @@ -431,7 +438,9 @@ cpu_initclocks(void) thread_unlock(td); #else tsc_calibrate(); +#ifdef DEV_APIC lapic_calibrate_timer(); +#endif cpu_initclocks_bsp(); #endif }