From nobody Sun Jan 25 00:24:43 2026 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 4dzC981QG6z6Pttc for ; Sun, 25 Jan 2026 00:24: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dzC976DtGz3cvd for ; Sun, 25 Jan 2026 00:24:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769300683; 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=c/B3h/uQIkzXwelw1IvOwOK7+xyQE1lCsdTMPoC/+aw=; b=FjEvaMK9a60yt8f8Ad5ywlmPZQ+LX5gK6c+rSVGKO5q+OVMhsrCV122bn7Q0TWVAfOjaRZ 27rbZsRiqekcnV+Ir4m7SYbcxpzJnS2s49/c8y2kXuZjl6+tXmUj0CmpJb7m+PIpkT0wzx YTu5+bdhAOQF1ir/A6O48tdscrETjQLemSNRzJsl8vcXcQCcl2g/IIVz4XXzjrJApwExyI ErDZcZluaH/5Uk/wvzGphkrG2QMdynqD7lBmfOkxcILW0wobEsE8HzPW15tOzdUsuW3nNd DBwHMlrChLINsdz7Slw3v8ipO2MSBnBxuqCAhw2mb5w4Qt6/cFzCEh7Hjdmw1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769300683; 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=c/B3h/uQIkzXwelw1IvOwOK7+xyQE1lCsdTMPoC/+aw=; b=r+nwUC2jla4dxZvpORFNE1RPNloq4UXEt4juYJHiDWqjlyOR9ewuOkb0RetLreUTA5Z007 QFB+9RJXwqwVkY9za1cu+tSKK5PbKgbwlY8qCg8iM4rDmn+0S+h80CUXO3cdh31gAFSyW8 edPiaDQ0IJ+lmVDBIRhNXpScW9Ulc7ce4+YbXA1FAntpa3a09RppXVlI6j/MOz/e7PmH5g C6yNy0nkLFhnPznvWZTxNtakVIcST7/OUjEOuZS4AxLJ3IQ/NxSyHmH30RYVNZGdlIPx5x 3j9l7MROb8cOpytPFP2ee2xjQPnQTVuLGhmlib005joLkbpoHNUvHyBi6j+pHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769300683; a=rsa-sha256; cv=none; b=TaCb6pBfB3LmTnzgO5qqnfGBpu/LeSa93UFloYHF+xQmyW1AsL/cMcy8ajmLvyXRS+FpEk 1tIq8g88StKVfz2/VWI42tYgZhE0WV8ONy0MwstuaKTtDPeYMByqYyfXv2+ZkEHZI/TAdc QvTMApFt9Fz8DLo2LjK5q1gcE+L4dwIHeKmE5w5EOeoyWMQSO71X9ajTLOnlZMR3JiAlRJ gyUFtGNlFnvT2zZpvfeQI6M35RKAspnTTTLT0UgTZnavkNmNvudvVqM6Z5GGo+h2aM6Zfx 3nJm7sV0XcOHYVWi5mc2ZSFjJedKpFyJhnRtpc5uJFn2XtBgHipQ1p4m3hMu9Q== 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 4dzC975XWJz1QTH for ; Sun, 25 Jan 2026 00:24:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 863f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Jan 2026 00:24:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 9286d8fe2873 - stable/15 - x86/local_apic.c: add lapic_maxlvt() helper 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 9286d8fe28732034f039fc26381ddb964d8a393f Auto-Submitted: auto-generated Date: Sun, 25 Jan 2026 00:24:43 +0000 Message-Id: <697562cb.863f.475275e@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9286d8fe28732034f039fc26381ddb964d8a393f commit 9286d8fe28732034f039fc26381ddb964d8a393f Author: Konstantin Belousov AuthorDate: 2026-01-19 12:50:09 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-25 00:23:34 +0000 x86/local_apic.c: add lapic_maxlvt() helper (cherry picked from commit ad5e3cb950344f9822dbbd90f5ac7c256f97fa4c) --- 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");