From nobody Thu Apr 16 15:04:23 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 4fxLrm0dPwz6Zp7W for ; Thu, 16 Apr 2026 15:04:24 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxLrl6hHfz4Hvw for ; Thu, 16 Apr 2026 15:04:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776351864; 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=Y8QIj6r40T4GeKl9N2Zso6Vfsy+fgKZfibqOrbDAjmo=; b=bC3RcZPEg9r6fr4U2ruLckQxP/LG2bdfDPPotzw40/itbbCBQrEXnAaz1JXilqoi8cueAh CHBOkFl8S6jccpYET24zKaU5X3dTpDkYXHMSNMoOgFMCzQgZSuiW3ziUtNeX0/UgYyl3iC NAgsD/bLdeupkiVuyMmHfIdkMRcBcYIeQHAuW8GmkUw9Au4v7T9O2UVuaS8gj5g0ugwNd8 IU4XwaIoEjocJc11U44KGK4/rxNiy/e/DZwBX4Wwhg0J7VeOrHy3eGddNyMLg8TWjqrRed PT3TInCubM5rwdIu4g8pScYvzpp0x1X8t4TSbcXD2seFdgnoW6lKnp4V/Z65sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776351864; a=rsa-sha256; cv=none; b=d+Zgk6RrYij14OqvTxwwQqjWN1aOQYbkLWoKN2j0xZKc4adZ0xPD1zUndOvJGCqLNjWHj0 sJ3mARuItNmsCwboscEDmGLufYAJDfWJajhgfeIRBOI5chK7FxErCYtentF1aU7nRbYbvM GDFzvCy55MxlJvYMrXRsQVW3J3Wm99w8JEpUEGE31Z5R/jui1hSxWPALICJnNa2cK9sLQZ siBksmqsntC5967DPB68RVxzXK5O18sj1vxcwvEhzHy6DtkiMQ1rHll5XQISAkB7dGxxBk wGkJg1HgMotDp86Y+nJL5JM1TMjPzy0EfeflHfc2Ij/rzi7SawPQ8G4BIAXPNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776351864; 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=Y8QIj6r40T4GeKl9N2Zso6Vfsy+fgKZfibqOrbDAjmo=; b=dl1v8Qo4be+Jdcm8otmb8t/jnTmc1ShtRpPmOPdSQNC0DyKbE7qbLfZSeVCmaiK0jwUDuQ BLAqkSI3m0sNB/SL1D4r3PmrlSO00PN20D0Mz1mzjU7X+iW+00rKYKN0XME2mc2namCaQz n68iAhRAS9Uk5D4oQ+SwHEEGi/UmitNK20T8CsPuNDLtxEDb673+unNQAvzRAOQIKayyEf G/1xTY3s/3PaIRbEp71WTZXidxcxL2yYVsKkXnvtwCc/FB6UjXTHW6rv8OMAXQOi6ILm76 yepyL5eUjnR/YcJ+CTTyo2ZuN/G8RnXfs2os/2vb5aWZUrZsmMcqYXGaIBqpig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxLrl5ZbXz1BlY for ; Thu, 16 Apr 2026 15:04:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d89d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:04:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 644665e4b013 - stable/15 - x86: Add struct ioapic_intsrc.io_valid 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 644665e4b0136b13d44859f9252368f753ecebd3 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:04:23 +0000 Message-Id: <69e0fa77.1d89d.29e2702@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=644665e4b0136b13d44859f9252368f753ecebd3 commit 644665e4b0136b13d44859f9252368f753ecebd3 Author: Colin Percival AuthorDate: 2026-03-20 22:02:29 +0000 Commit: Colin Percival CommitDate: 2026-04-16 15:03:58 +0000 x86: Add struct ioapic_intsrc.io_valid As of this commit, io_valid is always set to 1; but a future commit will set it to 0, at which point IOART_INTMSET will be set to forcibly disable interrupt sources regardless of whether they are requested to be "masked". Reviewed by: kib MFC after: 3 weeks Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D56006 (cherry picked from commit 1d0ccd61563d48e914dccf3dd5cf0280d8331ec1) --- sys/x86/x86/io_apic.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/sys/x86/x86/io_apic.c b/sys/x86/x86/io_apic.c index d0f47f82011a..03d85acabb1a 100644 --- a/sys/x86/x86/io_apic.c +++ b/sys/x86/x86/io_apic.c @@ -85,6 +85,7 @@ struct ioapic_intsrc { u_int io_activehi:1; u_int io_edgetrigger:1; u_int io_masked:1; + u_int io_valid:1; int io_bus:4; uint32_t io_lowreg; u_int io_remap_cookie; @@ -193,7 +194,7 @@ _ioapic_eoi_source(struct intsrc *isrc, int locked) ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(src->io_intpin), low1); low1 = src->io_lowreg; - if (src->io_masked != 0) + if (src->io_masked != 0 || src->io_valid == 0) low1 |= IOART_INTMSET; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(src->io_intpin), low1); @@ -268,7 +269,9 @@ ioapic_enable_source(struct intsrc *isrc) mtx_lock_spin(&icu_lock); if (intpin->io_masked) { - flags = intpin->io_lowreg & ~IOART_INTMASK; + flags = intpin->io_lowreg; + if (intpin->io_valid) + flags &= ~IOART_INTMASK; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), flags); intpin->io_masked = 0; @@ -375,7 +378,7 @@ ioapic_program_intpin(struct ioapic_intsrc *intpin) low |= IOART_INTAHI; else low |= IOART_INTALO; - if (intpin->io_masked) + if (intpin->io_masked || !intpin->io_valid) low |= IOART_INTMSET; switch (intpin->io_irq) { case IRQ_EXTINT: @@ -697,11 +700,13 @@ ioapic_create(vm_paddr_t addr, int32_t apic_id, int intbase) intpin->io_activehi = 1; intpin->io_edgetrigger = 1; intpin->io_masked = 1; + intpin->io_valid = 1; } else { intpin->io_bus = APIC_BUS_PCI; intpin->io_activehi = 0; intpin->io_edgetrigger = 0; intpin->io_masked = 1; + intpin->io_valid = 1; } /* @@ -796,6 +801,7 @@ ioapic_set_nmi(ioapic_drv_t io, u_int pin) io->io_pins[pin].io_bus = APIC_BUS_UNKNOWN; io->io_pins[pin].io_irq = IRQ_NMI; io->io_pins[pin].io_masked = 0; + io->io_pins[pin].io_valid = 1; io->io_pins[pin].io_edgetrigger = 1; io->io_pins[pin].io_activehi = 1; if (bootverbose) @@ -817,6 +823,7 @@ ioapic_set_smi(ioapic_drv_t io, u_int pin) io->io_pins[pin].io_bus = APIC_BUS_UNKNOWN; io->io_pins[pin].io_irq = IRQ_SMI; io->io_pins[pin].io_masked = 0; + io->io_pins[pin].io_valid = 1; io->io_pins[pin].io_edgetrigger = 1; io->io_pins[pin].io_activehi = 1; if (bootverbose) @@ -841,6 +848,7 @@ ioapic_set_extint(ioapic_drv_t io, u_int pin) io->io_pins[pin].io_masked = 0; else io->io_pins[pin].io_masked = 1; + io->io_pins[pin].io_valid = 1; io->io_pins[pin].io_edgetrigger = 1; io->io_pins[pin].io_activehi = 1; if (bootverbose)