From nobody Tue Jul 19 14:09:31 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 4LnLLM4JXBz4XNqj; Tue, 19 Jul 2022 14:09:31 +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 4LnLLM3S83z3ZNY; Tue, 19 Jul 2022 14:09:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658239771; 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=WqX6mATgI2usNGNUGMP6cHDye5SRY9Y/Hfq2K15roZA=; b=kKrbH0jlAB+9d92LsZ4Vas4dEm4Bc1XShb56xQ37lA+eZvdLgfVmfQER/+6xxH7SrLAmqo EPW42QQKJhGfLMbZYTsDewQhcwMWxPkxnU9w46ia50uiuxqaIXWEj9iOp6vIEK7IBIN5B8 wcpmqkyKPcg1a98mEA/tUPiZjq5suM0Hrtm5iWsFK90aJLyfppOBiK6LT8q4i1qVSfJCHu 71DP+rI45BQebfJPdb5HU+nXM69N3xfVNSHb3w8VcU5tY34tSm+/yIwblzr7z+Ha1QNrFG KSTtCE6CyNLqixm38E11D+0+xBc2H3qm3gk34Gg28wsyFv5em+UlrEzkCiTGLg== 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 4LnLLM2Tz1zM9F; Tue, 19 Jul 2022 14:09:31 +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 26JE9VAZ052093; Tue, 19 Jul 2022 14:09:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26JE9Vwb052092; Tue, 19 Jul 2022 14:09:31 GMT (envelope-from git) Date: Tue, 19 Jul 2022 14:09:31 GMT Message-Id: <202207191409.26JE9Vwb052092@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: 927c85811494 - stable/13 - x86: Check for APIC presence only if DEV_ATPIC is defined 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: 927c85811494679b75f8c9c3f570888bf972b53d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658239771; 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=WqX6mATgI2usNGNUGMP6cHDye5SRY9Y/Hfq2K15roZA=; b=qnNrUdMYI80uerzZfkjoMnQe9a1HYFxxhZ9EKMCzslVAEFgGeL6G4ez4DrieRggSvM8Qfn 2hvME3Ysj+VDtuyWQqCmy9Z70zi4MhsQv8bsurMZkW28UfxRHX19spUtCX1APhJ3ASQjYU rT1neVv1JtSKgramPsv/Uf9gzywqpfanIzsco3eDA1NnxzHjgI+ekSRRvpYSbrYGCgTDxs W+EzMQwAVpvO77vWLKUNxOm/eC/Q6CCs0iW5IK6xBFOz45TxwqBWV4wa76XEIkuSyQ+WAp 9rrk8dkjyqrDG7/Cl+VyzvBauel0VMPSBliZSORrdk9YFQN66bVSnKNN/JN50w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658239771; a=rsa-sha256; cv=none; b=rOGDhRyCbg4nRu/6OFLxB1I6PrEPy8L/qVNPrviirsxZDAuaDR2ZEBlejY74o6UyXkgqaX SEigmSrt+Me0cNhGRIuDyrZBDKZYYMRMkiZnYYrS+RQm3vbLt7Yf5osI0qzHkUtuvQIFhY LRbn8xKhhZulUYEfy5P493lYzHpNuqUPRvF68U7pep0M92yd7yC2p0+k9Ri2KpAdy5xuBS xpHiqBHbG6lNIBLExru23EvlqywiMQjN56sXt9uwWBjaaIiOWtBcbvXg4mi3haOU776J0O 0c01BatIfxJjIpFpCr09ma32b3HBRJqKZ3x9Ctqdbl5tzE1I8vU/6VxgL4CbcQ== 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=927c85811494679b75f8c9c3f570888bf972b53d commit 927c85811494679b75f8c9c3f570888bf972b53d Author: Mark Johnston AuthorDate: 2021-12-28 22:42:12 +0000 Commit: Mark Johnston CommitDate: 2022-07-19 14:03:15 +0000 x86: Check for APIC presence only if DEV_ATPIC is defined We only attempt to gracefully handle absence of an APIC if "device atpic" is defined in the kernel configuration. Suggested by: kib Reviewed by: jhb, kib Sponsored by: The FreeBSD Foundation (cherry picked from commit deca0138dc659747c9edd4648690cdfdb01f58e8) --- sys/x86/x86/local_apic.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index bbe3a63157d4..4ebe345e8926 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -939,9 +939,11 @@ native_lapic_enable_pmc(void) #ifdef HWPMC_HOOKS u_int32_t maxlvt; +#ifdef DEV_ATPIC /* Fail if the local APIC is not present. */ if (!x2apic_mode && lapic_map == NULL) return (0); +#endif /* Fail if the PMC LVT is not present. */ maxlvt = (lapic_read32(LAPIC_VERSION) & APIC_VER_MAXLVT) >> MAXLVTSHIFT; @@ -978,9 +980,11 @@ native_lapic_disable_pmc(void) #ifdef HWPMC_HOOKS u_int32_t maxlvt; +#ifdef DEV_ATPIC /* Fail if the local APIC is not present. */ if (!x2apic_mode && lapic_map == NULL) return; +#endif /* Fail if the PMC LVT is not present. */ maxlvt = (lapic_read32(LAPIC_VERSION) & APIC_VER_MAXLVT) >> MAXLVTSHIFT;