From nobody Mon Apr 11 14:10:48 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 3282C1A989F1; Mon, 11 Apr 2022 14:10:49 +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 4KcW3Y0yQRz3JhF; Mon, 11 Apr 2022 14:10:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649686249; 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=GBXLq+nF4pRyaS+xcm0NqCrcFnyN2W2zQ4XA9FDaYYQ=; b=ELvvjHPTnBrM2ibXUdNWbRifGL0hUXNlv58keNJmAu/G+rfpW1J4uJmdh5MpzVD51FdXAR GvW/7Xaq7ZAzR/byw4IPDHc+F5ewGAAHUeeWo/Zexy/c7970xHAyrDEB5qsKwehJNFnE3m iPsBNT6/Lh1tqwAizmIErZyS4T1M+q+eX/YRXigwSYOPKOAMHbx3d9z1CHGk15ZTQOoRti JBCrWdPEQl5HoZWMMFumQD7rBMUw645C6+DLTxJiyERvmJZG7h6ygfvtRz+eJ1CHVlqQlh dSC23iH/8XuQTgFnT5kZJHGcwMyilHJgZLCSQLMraIZl/DZi8A/9nb3yfGfXYw== 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 01E9724580; Mon, 11 Apr 2022 14:10:49 +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 23BEAmPT065191; Mon, 11 Apr 2022 14:10:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23BEAmRw065190; Mon, 11 Apr 2022 14:10:48 GMT (envelope-from git) Date: Mon, 11 Apr 2022 14:10:48 GMT Message-Id: <202204111410.23BEAmRw065190@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 21a2bfcafbff - releng/13.1 - 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/releng/13.1 X-Git-Reftype: branch X-Git-Commit: 21a2bfcafbff2a6bd3b29c5e6e75d35bdb1fb959 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649686249; 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=GBXLq+nF4pRyaS+xcm0NqCrcFnyN2W2zQ4XA9FDaYYQ=; b=pimT935d+lM5YrMpXn3A3HN6bExY8aV1xkXOKhlTI91wil1W+e90PabJ0eSdJagpLzF44S qf3LT9jcy7Cr8UADGpw42YXfD5XhtfjRkRNkFhuFhkNqlmiMSnjOC2BTtvSAZUkDBfT5GP K4sjwyk73y/ZUVyxpKjRMHal72rHL1AAXMFFCJ/3RIInoeBUB3emO65/OauuOg9dFfB9Ix pBgH2y/gPbtpzioPOyHD+/t/KO9V5SNt34bOJRl/JUxB9wLg+Qi75gWzalg+9B5SSuLC/a obVQggBDlxpMzcBww7QYVjFp/Zg0wh0AkUjAr/6lfoTSu7JJqjlkc/7JgXPLag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649686249; a=rsa-sha256; cv=none; b=ynkY00ZezNKvDgXHLFsAh3Nqw+zsimMR9ciX7fFJsiDKYOYBLFzxBMYDIEB3J2ArMov1Jq ERLY6yTwZWYtGkwTolbNOnSAbYkw5b7fazNQ+AhGI9a6OsZwRtPrVUtwFU5K1lgqq1Ef5C V61mqte7i98ttBN9XqBxzWAAv7SzBu/nqfcU+WOx1JJTtnMJVinx7jJkyRCwNXEEUjmAWk s/I/ZCabYV2gjqCcTzHJxtB1PTPpCIKnEsW48NoRPdnDGSy2pP4fP387axmD3BrzzqFBhW bmiFFqaMeB8uoezTqx1JFqYHgJANCzeppXIi2oglj/7azgCPcI/p4OYxkIV4iA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=21a2bfcafbff2a6bd3b29c5e6e75d35bdb1fb959 commit 21a2bfcafbff2a6bd3b29c5e6e75d35bdb1fb959 Author: Mark Johnston AuthorDate: 2022-04-08 15:47:52 +0000 Commit: Mark Johnston CommitDate: 2022-04-11 13:59:15 +0000 i386: Fix the nodevice apic build Approved by: re (gjb) PR: 263124 Fixes: 62d09b46ad75 ("x86: Defer LAPIC calibration until after timecounters are available") Reviewed by: kib, jhb, emaste Sponsored by: The FreeBSD Foundation (cherry picked from commit aa597d4049ffee69d413ea2154f4b312ffbaf646) (cherry picked from commit 4f659ce4daf82ac3335abf3aab7181f2ac90a4cd) --- 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 1178d35979c1..62a026b92d99 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" @@ -414,7 +419,9 @@ cpu_initclocks(void) td = curthread; tsc_calibrate(); +#ifdef DEV_APIC lapic_calibrate_timer(); +#endif cpu_initclocks_bsp(); CPU_FOREACH(i) { if (i == 0) @@ -430,7 +437,9 @@ cpu_initclocks(void) thread_unlock(td); #else tsc_calibrate(); +#ifdef DEV_APIC lapic_calibrate_timer(); +#endif cpu_initclocks_bsp(); #endif }