From nobody Tue Mar 15 16:26:43 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 911EE1A27C54; Tue, 15 Mar 2022 16:26:44 +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 4KHzLr240Pz4mHK; Tue, 15 Mar 2022 16:26:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647361604; 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=UXFq3QpAny+wEexst4KiBMwW+00UZ2d3o3RqXieRJbg=; b=oSjqRaSIbqKMG5zeAA3WyL2GelYVImnLnrhV8ey/wjFG/JimcSL+W+ia0M8sxQNux9L4fv hrMygGRoFSV2G5EHEcRV4YT6w7NDFEpA6BVms4apMYxF8EfLLfjhPxnVSJK/gRjDnAZECX pbwDZloXjORoTI4A8wKHPawvzRzIYjYlWHWAKQUn65xlv3iKwzFfIf31UnmRMvTX+wU7yb 6ZEOD14r9MgqwNCSuMbnhgUSHoP/zVEDcCeHpxQNc74pNDWuJvcelMTQzuQzPv+jAmwE66 fftX7sDg06V+d+M/zR+A4PYbkayQP6Puroatxzc4rmhLp8dkoEdz+Zli8XeAPQ== 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 1743B250B2; Tue, 15 Mar 2022 16:26:44 +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 22FGQhRJ024890; Tue, 15 Mar 2022 16:26:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22FGQhgB024889; Tue, 15 Mar 2022 16:26:43 GMT (envelope-from git) Date: Tue, 15 Mar 2022 16:26:43 GMT Message-Id: <202203151626.22FGQhgB024889@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: b01d706cca59 - stable/13 - i386: Call clock_init() after finishidentcpu() 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: b01d706cca597cd1fbf9178974a246d4896d544e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647361604; 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=UXFq3QpAny+wEexst4KiBMwW+00UZ2d3o3RqXieRJbg=; b=HZ9euddZpv3DkaOd1DSTNEj0V0LSGX3LMp4DF+h1bIiGpnhyb+PXeIkux90HQsTiZTNp1E 48jJOZE4F38hvJ6akZkGfYx+VqR7Pu4mIXPAoA4CnaBvasPa1NfJ9p1rUlxNO46pA8zYd2 AJAeg7uenWVGRY+G1f+gJmrCOYROvQV9k/f3mH9OrxAAw7XyWxq4j/nZjgE60Fv0L6TRkW tqiXQOA0vQr5fKxePQJzHhJ9p1oAliK8xMrBHjakDRYy1XpRDHhzv6X+l77cIw89k47qBW coAe/TC2oB313kvZKlY/v/EyBGmYCYB7SN2FmzSCRg8GDPAI3c0AyoiR54Z7yA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647361604; a=rsa-sha256; cv=none; b=I1wyFohC+zjiKPjhyQJSlJPbwLEiq8dtQ0QZSFKrbAmMpkl9wDSh4Eor4hNTpth++MCx1H XBm4V5pNK7QFsAEewTRD8xkWnHp8psQBVp1Tn8QE+Q1zjehIjAKS6tXOasMF4cdhx6cGyA sWvh8sWipazxQhNLjcYTN1YFNNZMGZosaLh6p8OfD1lU3yR7gfyhm5EhuJ5+bROHl3c7u/ X5TiFy45MMAmZadAQPCxBT+q8DLw/MRO6wZ2uGJER2ojuQfo7IIeFDn486PmSerIe22ZlX LTG6sLdnmGvPeNy6ZjPsQuG5iGOn/zhs7AWhRw0x4YEVFu8Cvbv3uZ52nBiZ5Q== 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=b01d706cca597cd1fbf9178974a246d4896d544e commit b01d706cca597cd1fbf9178974a246d4896d544e Author: Mark Johnston AuthorDate: 2022-03-01 14:00:05 +0000 Commit: Mark Johnston CommitDate: 2022-03-15 15:41:02 +0000 i386: Call clock_init() after finishidentcpu() In a subsequent commit clock_init() will attempt to determine the TSC frequency, and this requires that CPU identification is finalized. Sponsored by: The FreeBSD Foundation (cherry picked from commit c3d830cf7c71614d21f57c24039de219e4a90538) --- sys/i386/i386/machdep.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index e1224e2f8ae8..447bbf969e6f 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -1488,13 +1488,14 @@ init386(int first) r_idt.rd_base = (int) idt; lidt(&r_idt); + finishidentcpu(); /* Final stage of CPU initialization */ + /* * Initialize the clock before the console so that console * initialization can use DELAY(). */ clock_init(); - finishidentcpu(); /* Final stage of CPU initialization */ i386_setidt2(); pmap_set_nx(); initializecpu(); /* Initialize CPU registers */