From nobody Sun Jan 25 00:24:44 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 4dzC9938Zkz6Pttf for ; Sun, 25 Jan 2026 00:24:45 +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 4dzC990blNz3cpy for ; Sun, 25 Jan 2026 00:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769300685; 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=ZRoyBE/gAE9AI0anoItBshyFGOG2uScfJCouDLJ9mFw=; b=oiqLMeTQOh76kUc4+o48KTphyUwtfPX3XB9qlc+c/OwgSHJ6vDzCmnI1oMUZE/iCljn0pf 3Tl2OEE+HGt3C27Xy/6c6nY5g49NmXmvK7fM7bR4pt1IyaqPrHzqrRtuAf4WPuNpUBvttC nImbNuq9YfTzsToPTN/ksGV5zRivT9meun1VCUQJQG0pV7XhvHJPhMfWM8LzTTuBVD0b8T +tOWLkmY/baLUVC/sB1CSVV3HG0Qe7jEoZfh7GCe497+rMSD1wbZt2yVMO3Uet/0HTb0VW opfe47etdCAfnpjIOQzI4gkUUntOErdoJ6o4RB9CIFf0CBfJQWp7AYRZUG0iDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769300685; 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=ZRoyBE/gAE9AI0anoItBshyFGOG2uScfJCouDLJ9mFw=; b=Wfz/AKVPQ1duy38oYCdgqeanOjUMYN4NYhNeHdBJZnx7y3tB5dt4TLBOwqv7Pdc0IGYZkq OwzEjhA2U1Ss1WKmflH94t8cNT8JaGad/aOcG4/ojLhjlwa9OBKu2Zs4bZud07HTf+UwKt xQBj5IGejPWdBrdY2uw7ybwcpv78/N6GhvUh4m6a9lQuWKsGdsjTquG821ZamLB5znT+1d JD9YeHagfqREifIU1N2GmzQWxZK4wxCizLNgBswbLPX0V4qN3sznX5dmlBNTENz7Zs684w jUAtCACdPPsaJYHsHbTh/3VCGyAX7S0YOc63BJ7wmz6jfeYmaqgagfM6+Fvz5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769300685; a=rsa-sha256; cv=none; b=e+dSl0Y6dzme3aaHkdX4YNnHaZ+dK7Gea6Bd4WwciM++J52YsD4MTwUwfNusVPwgcxMOJg f74kyRarmHQ9WCBG7SGzX0+BI7PBVD9n3v/3CQ7sI6Lp+obxEPAOApqE429P2UO/4wkxVQ pVJrXs/MaxLNqFMn+qbjvige0evCE7jczRaXK2CzOtgjLxJ1C2U38QutyYSEup3C1BsHsf pA1mXPWvftqZiiVWDM99zYAeNHP5BJ5dTcG2JIOdVuKq4mrnrURxbEsUqn9Cr5iqcdnfIE /yI6J71b2jpjr6efn6qCnxLgheHa+f7ShKxnax4XjIig2jyUyktiLtoE640RPA== 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 4dzC986PKSz1QjG for ; Sun, 25 Jan 2026 00:24:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8559 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Jan 2026 00:24:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 7d327e4ce6e0 - stable/15 - x86/local_apic.c: Properly calculate the number of LVT entries 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: 7d327e4ce6e0e62ad7be87527d565bdb93ef92dc Auto-Submitted: auto-generated Date: Sun, 25 Jan 2026 00:24:44 +0000 Message-Id: <697562cc.8559.58d7c502@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7d327e4ce6e0e62ad7be87527d565bdb93ef92dc commit 7d327e4ce6e0e62ad7be87527d565bdb93ef92dc Author: Konstantin Belousov AuthorDate: 2026-01-19 11:55:36 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-25 00:23:34 +0000 x86/local_apic.c: Properly calculate the number of LVT entries (cherry picked from commit 709a53c8b20b5770f7e2f117d4799b5617479976) --- sys/x86/include/apicreg.h | 7 ++++++- sys/x86/x86/local_apic.c | 7 +++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/sys/x86/include/apicreg.h b/sys/x86/include/apicreg.h index 1252647fbab3..4cc9cabdad9e 100644 --- a/sys/x86/include/apicreg.h +++ b/sys/x86/include/apicreg.h @@ -439,7 +439,12 @@ typedef struct IOAPIC ioapic_t; #define APIC_EXTF_SEIO_CAP 0x00000002 #define APIC_EXTF_IER_CAP 0x00000001 -/* LVT table indices */ +/* + * LVT table indices. + * Must be ordered following the appearance of the LVT entries in + * series the LAPIC versions, which is reported by LAPIC_VERSION + * MAXLVT field. + */ #define APIC_LVT_LINT0 0 #define APIC_LVT_LINT1 1 #define APIC_LVT_TIMER 2 diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index 68f42c9eed0b..b444142d5481 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -819,9 +819,12 @@ lapic_early_mask_vec(const struct lvt *l) static void lapic_early_mask_vecs(void) { - int elvt_count, i; + int elvt_count, lvts_count, i; + uint32_t version; - for (i = 0; i < APIC_LVT_MAX; i++) + version = lapic_read32(LAPIC_VERSION); + lvts_count = min(nitems(lvts), lapic_maxlvt(version) + 1); + for (i = 0; i < lvts_count; i++) lapic_early_mask_vec(&lvts[i]); elvt_count = amd_read_elvt_count();