From nobody Mon Apr 11 13:44:00 2022 X-Original-To: dev-commits-src-branches@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 001FE1A85D47; Mon, 11 Apr 2022 13:44:01 +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 4KcVSc6Xs5z4vWS; Mon, 11 Apr 2022 13:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649684640; 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=ZV1wtDV7KtbANkpCHbP08umDod0U1PJy0ElDH+hMsZQ=; b=xJWdWQ4MRLKiafk60NkeSdMN9u4JdwFkDAMmDxrgZqxyW9rvgIJdw1rtUOR6GjkBqtTxK6 4s2WNrRZVCZ4V3JRbJVGJMISd+8WyMonL9gddtpU0sPbnwihv7CdzMGzNRCxKjiHMMHIaj l37Z5Otp1tWQv0yARDyjqHOIFGj1pqd4i949Yd8sb2bAArCY0lxnKrdkvHa7ll0uD0elKn HQquJ4VSF7RKi8ejIym+Zjp3XQtZ3NOY7P5rgR0lUqIK+O/J1WGvAERegigJhnK5UHPRdJ YvC6VZ5D7ZHNz1fBE46PsWmbJD2n2d+Rw8cqFgTbMzzEU/NHm9du2HNom0f0SQ== 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 C081424183; Mon, 11 Apr 2022 13:44:00 +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 23BDi0dC028963; Mon, 11 Apr 2022 13:44:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23BDi0Vw028962; Mon, 11 Apr 2022 13:44:00 GMT (envelope-from git) Date: Mon, 11 Apr 2022 13:44:00 GMT Message-Id: <202204111344.23BDi0Vw028962@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: 85e36b3c9c00 - stable/13 - i386: Fix the nodevice apic build List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 85e36b3c9c003ba37156720091b3b385f07fb9d9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649684640; 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=ZV1wtDV7KtbANkpCHbP08umDod0U1PJy0ElDH+hMsZQ=; b=kUwI7IrpB+AoEVw2Kha+KRP6Imz68uYmjkTn4rgGyVqzrKkJ+opXeBOSM+r+ro6H7LK2dC DYprxKeE1YL88pOvCOWVDk0KRiH21uX9dyhp0v/Q9PDags3MtTkTBjYo/3BTxIh+UXhH15 irjDYKYOsVPirYqsGHqcrEcTyVnfDbyJjzV39o/JHmlXaykNUSbPzxsyIm3BzwOALIzlD2 98RyqLhDnEzovLs32JezCVuLVBy5CvASDd+PtWpOYrgvHfJ4tguOjrzY/vgqqbaZiiMXCD ea6zy4b2+pSezpLE0KknYkezYsNzhP+xWtMixt42EL7SS+1a/pZvXOKYQwws9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649684640; a=rsa-sha256; cv=none; b=GIhOt5iF2QWM/ASl3LQTYxwXxfByjC4ruQDAqFYMKUscphLXQW7fzC71VFkVKiJrGEDmZs PfuNizKpEqmIj6vrbGw+WrTLT7GSVdQ1ULi7wVxf6hAe3yvRRUbaE7MAgVw8GMcI+koCqq 5cjC6ZZ6dwpH+X3KRhuM+JDoiEJ3x70q+mDtiJ/euuz1df+N2EUqGtqH8Nxm6n8ejXdhEO Ic7Tv8F/DS5DRWWNvLgmfZ0QPgCevEJhvRwLpJY8j0Gu/Ry1su3yNlKHtR9bTDktPRWZIQ CcoRMNtHEkZrseO/dT2EMZP10Nl8KeZMMRMxJ/FKSRWnQMhY7AZq0XDobU3LCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=85e36b3c9c003ba37156720091b3b385f07fb9d9 commit 85e36b3c9c003ba37156720091b3b385f07fb9d9 Author: Mark Johnston AuthorDate: 2022-04-08 15:47:52 +0000 Commit: Mark Johnston CommitDate: 2022-04-11 13:43:27 +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 Sponsored by: The FreeBSD Foundation (cherry picked from commit aa597d4049ffee69d413ea2154f4b312ffbaf646) --- 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 f21f847709cd..ed92f50d7c14 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 }