From nobody Mon Jan 19 16:20:47 2026 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 4dvwg42Q8sz6P1ZZ for ; Mon, 19 Jan 2026 16:20:48 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dvwg404knz3xnh for ; Mon, 19 Jan 2026 16:20:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768839648; 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=chMWPVCWMkgQ6GOc8Z3YraneEkWOVdVolOpSZfqdK6Y=; b=AUKMUO/EViN7OHWMLwnhvw0AJT09g561mrPkme1bjYdxFXNcx8KYc0rfgQbYqB+L/7BKjY N/lZB7lHAw5QD3GbNAqf/0pTkLy4HnjpVG7oF5jsg/4J3N6fLlteao7M6ZmU0EIlNMOsw4 8Hfg7ysYOerppFbKdqQkYFer/tnGBrrFErvWX84Ri7tjhSqzolte5rlzvMihP79meDhaPe XPFpDYCYzmlXksm05XDF3obx8OPOJHvK1mBIeFAMZbAioygf5bXnH1pfg/UsnC0aIVhne0 3/HxmJ4bXGutIz5REpZwJun3E2E7k+30uBNba4abccXhnRt0B7tw+QTqg5gAcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768839648; 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=chMWPVCWMkgQ6GOc8Z3YraneEkWOVdVolOpSZfqdK6Y=; b=AgVQRUw2Lp5AjuLXANShyiwd2gjVDv9x3XrwNwGju0KHue0Kug29FkeGO/XDUlyV3AQ7pV W48CGI5MwrGZYmt96czSk01GL0mUl/A639vFb2jQcKpeRLz2jNDVSpwPGPOkYnn+xlnBU3 TNdaIE7wOTvNpSSiH7R528FC+IlM6LIAbl25HBDSLccT1QG0qYDRTqhA6xMpNtA+hH6abr H6a4Z3X3xD9zCRSPEeDSD9inpg0EYrUgeqezY+7hFkwrBPTaCX3PTC6yrbZ0QyKL/9Yeba 4N3kPbBum1xM6FfVIu8ecnWnICtwrZq/A5rbHplv36cyIoI+TinhtInxapCZjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768839648; a=rsa-sha256; cv=none; b=mf1Z38v2fuJpAO1S6vqLeGrMGkh7EFwRCKjkMhhw4Wayznt778jUBBNDDCPjARQOcJwVnB c5CrRemImJ+LdISAh9s+/zQkJI6ENQXHPPlp/52KGfDIXrot6yQNeFNzA0oxm6rwkSVIxb bYrrCuwzWLzMbmXLh6Dzp89Uv5THOVRu9KhxjmAjoDjpfsJhdOeV/c9bOpT3Zaka6a6bqn jEXDBEZwg66yuBDL49naX5YYrkKvZGsaw/CvE5VNFEOV1vPq2UqBtw7wCY0/Xfyp9lFTMm d9aOvg0eaz00CmavvLojvgFkzeweBUcNpecP1d2858SfnnDNH4THyNajcue+/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dvwg36K7ZzfwW for ; Mon, 19 Jan 2026 16:20:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33c97 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Jan 2026 16:20:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: ad5e3cb95034 - main - x86/local_apic.c: add lapic_maxlvt() helper 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad5e3cb950344f9822dbbd90f5ac7c256f97fa4c Auto-Submitted: auto-generated Date: Mon, 19 Jan 2026 16:20:47 +0000 Message-Id: <696e59df.33c97.37dc64f0@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ad5e3cb950344f9822dbbd90f5ac7c256f97fa4c commit ad5e3cb950344f9822dbbd90f5ac7c256f97fa4c Author: Konstantin Belousov AuthorDate: 2026-01-19 12:50:09 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-19 16:20:36 +0000 x86/local_apic.c: add lapic_maxlvt() helper that calculates the max index of the present LVT entry from the value of the LAPIC version register. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54773 --- sys/x86/x86/local_apic.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index 053d9814c14c..68f42c9eed0b 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -314,6 +314,16 @@ SYSCTL_INT(_hw_apic, OID_AUTO, ds_idle_timeout, CTLFLAG_RWTUN, static void lapic_calibrate_initcount(struct lapic *la); +/* + * Calculate the max index of the present LVT entry from the value of + * the LAPIC version register. + */ +static int +lapic_maxlvt(uint32_t version) +{ + return ((version & APIC_VER_MAXLVT) >> MAXLVTSHIFT); +} + /* * Use __nosanitizethread to exempt the LAPIC I/O accessors from KCSan * instrumentation. Otherwise, if x2APIC is not available, use of the global @@ -753,7 +763,7 @@ lapic_dump(const char* str) int i; version = lapic_read32(LAPIC_VERSION); - maxlvt = (version & APIC_VER_MAXLVT) >> MAXLVTSHIFT; + maxlvt = lapic_maxlvt(version); printf("cpu%d %s:\n", PCPU_GET(cpuid), str); printf(" ID: 0x%08x VER: 0x%08x LDR: 0x%08x DFR: 0x%08x", lapic_read32(LAPIC_ID), version, @@ -834,7 +844,7 @@ lapic_setup(int boot) la = &lapics[lapic_id()]; KASSERT(la->la_present, ("missing APIC structure")); version = lapic_read32(LAPIC_VERSION); - maxlvt = (version & APIC_VER_MAXLVT) >> MAXLVTSHIFT; + maxlvt = lapic_maxlvt(version); /* Initialize the TPR to allow all interrupts. */ lapic_set_tpr(0); @@ -990,7 +1000,7 @@ lapic_enable_pcint(void) #endif /* Fail if the PMC LVT is not present. */ - maxlvt = (lapic_read32(LAPIC_VERSION) & APIC_VER_MAXLVT) >> MAXLVTSHIFT; + maxlvt = lapic_maxlvt(lapic_read32(LAPIC_VERSION)); if (maxlvt < APIC_LVT_PMC) return (0); if (refcount_acquire(&pcint_refcnt) > 0) @@ -1014,7 +1024,7 @@ lapic_disable_pcint(void) #endif /* Fail if the PMC LVT is not present. */ - maxlvt = (lapic_read32(LAPIC_VERSION) & APIC_VER_MAXLVT) >> MAXLVTSHIFT; + maxlvt = lapic_maxlvt(lapic_read32(LAPIC_VERSION)); if (maxlvt < APIC_LVT_PMC) return; if (!refcount_release(&pcint_refcnt)) @@ -1883,7 +1893,7 @@ DB_SHOW_COMMAND_FLAGS(lapic, db_show_lapic, DB_CMD_MEMSAFE) v = lapic_read32(LAPIC_VERSION); db_printf("version = %d.%d\n", (v & APIC_VER_VERSION) >> 4, v & 0xf); - db_printf("max LVT = %d\n", (v & APIC_VER_MAXLVT) >> MAXLVTSHIFT); + db_printf("max LVT = %d\n", lapic_maxlvt(v)); v = lapic_read32(LAPIC_SVR); db_printf("SVR = %02x (%s)\n", v & APIC_SVR_VECTOR, v & APIC_SVR_ENABLE ? "enabled" : "disabled");