From nobody Sat Mar 28 05:56:26 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 4fjRbH0JsLz6Xb4G for ; Sat, 28 Mar 2026 05:56:27 +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 4fjRbG4ns4z3qJx for ; Sat, 28 Mar 2026 05:56:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774677386; 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=mK5AevRY39NHPl0be/8Xc0Pv0HpcXUo9PJiovi5+I0c=; b=e8BfwcW42sXsOzsen4VifzDCWnvVFya+2W1LV66AkNbdl/Vwwcut/e9kbis8GUq3waHOzK s5AuyQ33MSGeObMk+lwGPTnRkDLvJIoYs+c8jspc3pWZDh9KQEB3U4/hQZJ9qL0onoGE4w 9eriwwouIA8ejcBPpKdHqSWJkv2gtK3NOEG8gG3Jbt8JUsOpn52AoXeDxqkK3+EMvzsHM3 uRqOHTjNsRAl28p/WDr0dIMSwBpbcSew8qbX9BRC2iYx/FN0NIsPcHqEiTNGM1SmXMugaE O7q8AQahjf3IQyZ0ZR70YtnxCmfqLdrx9zc/hBmfDqmkd+v3MHdDJlPQ/Bt/TQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774677386; a=rsa-sha256; cv=none; b=PBx2SXTNuTJD9a1frTaw8nNAhg4YlqmTHWdoD6VvOj0Y42CCCztSLGbXKQ0IZp65H1CdQ6 rKeh1ONt23CNkESsYLl6MZqM84SigS6PbAUkaEh22MUyWHM5xSD34zQCF1opeA7bDFBW+G Ff1t+KTswfkl8r4KuhRZJnBxx7OkrK3Dt+6unwy7pLiVtsxKDtv+l9Iu058Ue1WLb8dZUE /KC6PhTMlKrL5YUg5dVZofPSY/fs8FJOkJ88oeuTaGQSu0x3TV2tOFfpFPXMiMcqZjQw5G aHShPeUVo7iu7opHe0bZyAC1dhqNMlPr75mZvmrpwLfC5QIej2svd8IQbMHI4g== 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=1774677386; 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=mK5AevRY39NHPl0be/8Xc0Pv0HpcXUo9PJiovi5+I0c=; b=UoxqoIHfxF/uw/D6ethnLyzMebjU19/XxbDLJXxZ0Uz3EGs2uwoC+wiEBotsrwg35u9MEa 1PpW11I8XWscVpRvDw+9e5+ojvlhoVydezMgkigYCQ7nv7SpcZY60JkPLMmC8WAZLcp02A omIFnvaViFtQpqv2h+F32DL2BKKmI+YEPPFIj0AiFtBfJP1lEeOO9vU9p/GvHSA3vov0jb U1LAVaMCBI7mDn5dwTPbxhbUg5l1Zpos0csYSkrqTrBOHq+XeZjem6eb/gA7x8jY47u65S 1MEzg2/0b0b4JglCXbzJms7fzNAZqArHxD+OymaQ72fF/sMJJ2q0NOHprvnQ5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fjRbG4LNwz1ByD for ; Sat, 28 Mar 2026 05:56:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e2c1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 28 Mar 2026 05:56:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 1d0ccd61563d - main - x86: Add struct ioapic_intsrc.io_valid 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d0ccd61563d48e914dccf3dd5cf0280d8331ec1 Auto-Submitted: auto-generated Date: Sat, 28 Mar 2026 05:56:26 +0000 Message-Id: <69c76d8a.3e2c1.54866ca0@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1d0ccd61563d48e914dccf3dd5cf0280d8331ec1 commit 1d0ccd61563d48e914dccf3dd5cf0280d8331ec1 Author: Colin Percival AuthorDate: 2026-03-20 22:02:29 +0000 Commit: Colin Percival CommitDate: 2026-03-28 05:53:17 +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 --- 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)