From nobody Sat Mar 05 00:49:03 2022 X-Original-To: dev-commits-src-main@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 859CD19E051C; Sat, 5 Mar 2022 00:49:03 +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 4K9R1W3LXcz4TKC; Sat, 5 Mar 2022 00:49:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646441343; 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=CjYa8agplOqiZJY5uEFktxQDRb8z3cW/dBY8fGLfi0Y=; b=BXN8KDjnxf8L9OV0bKc7yvCQcsh3/PCRvjRlacAqONFn+ZOic7uHE7lvxm0zE+p15/HiM3 AEeLCp91o6kre06nZEk4Po1xse/3JZk1rSDETmHwa7OMJbWtw23aSNQDHCHMAdWjMxUKQF oMmW/FMQITzhfJTE3PeTIFb1FF0gxQDyH2lWomLTVUIBCW5AVnnpJg/IKP5Qvf8zTJ4qkw uM/HfvY/wMYb1Krb8tWMgMjkxV4vSJpClBpMk0kbaoAZ5Jx13p9MUXUB6bdCaoFdX9V9uF bEHd/w0kcUieiqmwEU3791GB7i0qp6lwsq2K5t6E12tnRH6sxALizaLB7LNcww== 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 52FBB163D9; Sat, 5 Mar 2022 00:49:03 +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 2250n3Wk072492; Sat, 5 Mar 2022 00:49:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2250n35R072491; Sat, 5 Mar 2022 00:49:03 GMT (envelope-from git) Date: Sat, 5 Mar 2022 00:49:03 GMT Message-Id: <202203050049.2250n35R072491@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: f7a6dccf4266 - main - amd64: Call clock_init() after finishidentcpu() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: f7a6dccf426676bdd8c6be25491e57dca830de25 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646441343; 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=CjYa8agplOqiZJY5uEFktxQDRb8z3cW/dBY8fGLfi0Y=; b=RKcFx50XaRd2Y2tAC6+MuMpfnjb0eQtlEurIqJOL9mOCDpKdW8079Wma54uHB+z2fho9mR esqvaNREDDKA0iHmFOgFDbP8sT+nqC8z7BPEnf0/b57Nbmd0gdBOKnEA4cJkiUsBIpAXMX NVZ2F2ZSlJEO2tt8H0W9mhbS0jjeoexZMIXDXi51iCJMK5dJ+5YG4PqgPaJP19uQ5ushVL Ih7G6yXpsR/GQeEbFpirrCl4BwcLlg6Upjmy2yxIG2RMajM46l2TV8UMvx89dZ8UHQLe3/ tZ8zmnQSafvqI9vG2WjQtBrIdc1yX6o0QkzDA7FPCQ0qsYHO0JZm9WqgIEbe3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646441343; a=rsa-sha256; cv=none; b=q/7fI1UhoJfCfolqquHDxg9sh3njJUC1k3/hkpDJQM0L57NVnRFDDs65V/Dusm/VB/EUhL xJN++zhn1eEhi8ZuVa8kj28wzJp0HXxYVwMruits7iwJVd12zAZmwJdiIRpxVgHLnYPHEU kfmMIKvttK5g6rk5k6fA75RCJf8GER9UhwK6rll+rj6mJqmshyh3agMjEFK0bLBLrd3QbQ jah1hK8ErvjT8cmhIOlcb6ES1rWWAX3PaJDgfX+SU7ybKmltWFV4N3M7E9JyTo4XoZ0+QD 7DVsmh8S4j2O2bYdjhcTRF+Trlrg9us4Iuav5TaQc0U20lwiEHx+Kq+J4SXeHQ== 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=f7a6dccf426676bdd8c6be25491e57dca830de25 commit f7a6dccf426676bdd8c6be25491e57dca830de25 Author: Mark Johnston AuthorDate: 2022-03-05 00:32:39 +0000 Commit: Mark Johnston CommitDate: 2022-03-05 00:32:39 +0000 amd64: Call clock_init() after finishidentcpu() As in commit c3d830cf7c71, we should finalize CPU identification before probing the TSC frequency. Fixes: 84369dd52369 ("x86: Probe the TSC frequency earlier") Reported by: khng --- sys/amd64/amd64/machdep.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 6eda6c9c8352..22a3eecbbb3d 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -1457,12 +1457,6 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) r_idt.rd_base = (long) idt; lidt(&r_idt); - /* - * Initialize the clock before the console so that console - * initialization can use DELAY(). - */ - clock_init(); - /* * Use vt(4) by default for UEFI boot (during the sc(4)/vt(4) * transition). @@ -1490,6 +1484,13 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) &x86_rngds_mitg_enable); finishidentcpu(); /* Final stage of CPU initialization */ + + /* + * Initialize the clock before the console so that console + * initialization can use DELAY(). + */ + clock_init(); + initializecpu(); /* Initialize CPU registers */ amd64_bsp_ist_init(pc);