From: Alexander Graf <graf@amazon.com>
To: <x86@kernel.org>
Cc: linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org,
"Clemens Ladisch" <clemens@ladisch.de>,
"Arnd Bergmann" <arnd@arndb.de>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Dave Hansen" <dave.hansen@linux.intel.com>,
"Borislav Petkov" <bp@alien8.de>,
"Ingo Molnar" <mingo@redhat.com>,
"Thomas Gleixner" <tglx@kernel.org>,
"Jonathan Corbet" <corbet@lwn.net>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Pasha Tatashin" <pasha.tatashin@soleen.com>,
nh-open-source@amazon.com,
"Nicolas Saenz Julienne" <nsaenz@amazon.es>,
"Hendrik Borghorst" <hborghor@amazon.de>,
"Filippo Sironi" <sironi@amazon.de>,
"David Woodhouse" <dwmw@amazon.co.uk>,
"Jan Schönherr" <jschoenh@amazon.de>
Subject: [PATCH 1/2] x86/ioapic: Add NMI delivery configuration helper
Date: Mon, 2 Feb 2026 17:48:02 +0000 [thread overview]
Message-ID: <20260202174803.66640-2-graf@amazon.com> (raw)
In-Reply-To: <20260202174803.66640-1-graf@amazon.com>
To implement an HPET based NMI watchdog, the HPET code will need to
reconfigure an IOAPIC pin to NMI mode. Add a function that allows driver
code to configure an IOAPIC pin for NMI delivery mode.
The caller can choose whether to invoke NMIs on the BSP or broadcast on
all CPUs in the system.
(Disclaimer: Some of this code was written with the help of Kiro, an AI
coding assistant)
Signed-off-by: Alexander Graf <graf@amazon.com>
---
arch/x86/include/asm/io_apic.h | 2 ++
arch/x86/kernel/apic/io_apic.c | 32 ++++++++++++++++++++++++++++++++
2 files changed, 34 insertions(+)
diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h
index 0d806513c4b3..58cfb338bf39 100644
--- a/arch/x86/include/asm/io_apic.h
+++ b/arch/x86/include/asm/io_apic.h
@@ -158,6 +158,8 @@ extern void mp_save_irq(struct mpc_intsrc *m);
extern void disable_ioapic_support(void);
+extern int ioapic_set_nmi(u32 gsi, bool broadcast);
+
extern void __init io_apic_init_mappings(void);
extern unsigned int native_io_apic_read(unsigned int apic, unsigned int reg);
extern void native_restore_boot_irq_mode(void);
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 28f934f05a85..5b303e5d2f3f 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -2951,6 +2951,38 @@ int mp_irqdomain_ioapic_idx(struct irq_domain *domain)
return (int)(long)domain->host_data;
}
+/**
+ * ioapic_set_nmi - Configure an IOAPIC pin for NMI delivery
+ * @gsi: Global System Interrupt number
+ * @broadcast: true to broadcast to all CPUs, false to send to CPU 0 only
+ *
+ * Configures the specified GSI for NMI delivery mode.
+ *
+ * Returns 0 on success, negative error code on failure.
+ */
+int ioapic_set_nmi(u32 gsi, bool broadcast)
+{
+ struct IO_APIC_route_entry entry = { };
+ int ioapic_idx, pin;
+
+ ioapic_idx = mp_find_ioapic(gsi);
+ if (ioapic_idx < 0)
+ return -ENODEV;
+
+ pin = mp_find_ioapic_pin(ioapic_idx, gsi);
+ if (pin < 0)
+ return -ENODEV;
+
+ entry.delivery_mode = APIC_DELIVERY_MODE_NMI;
+ entry.destid_0_7 = broadcast ? 0xFF : boot_cpu_physical_apicid;
+ entry.dest_mode_logical = 0;
+ entry.masked = 0;
+
+ ioapic_write_entry(ioapic_idx, pin, entry);
+
+ return 0;
+}
+
const struct irq_domain_ops mp_ioapic_irqdomain_ops = {
.alloc = mp_irqdomain_alloc,
.free = mp_irqdomain_free,
--
2.47.1
Amazon Web Services Development Center Germany GmbH
Tamara-Danz-Str. 13
10243 Berlin
Geschaeftsfuehrung: Christof Hellmis, Andreas Stieger
Eingetragen am Amtsgericht Charlottenburg unter HRB 257764 B
Sitz: Berlin
Ust-ID: DE 365 538 597
next prev parent reply other threads:[~2026-02-02 17:48 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-02 17:48 [PATCH 0/2] Add HPET NMI Watchdog support Alexander Graf
2026-02-02 17:48 ` Alexander Graf [this message]
2026-02-03 10:08 ` [PATCH 1/2] x86/ioapic: Add NMI delivery configuration helper Thomas Gleixner
2026-02-03 10:44 ` Alexander Graf
2026-02-03 10:45 ` David Woodhouse
2026-02-02 17:48 ` [PATCH 2/2] hpet: Add HPET-based NMI watchdog support Alexander Graf
2026-02-03 10:32 ` Thomas Gleixner
2026-02-03 12:36 ` Alexander Graf
2026-02-03 15:28 ` Thomas Gleixner
2026-02-03 19:44 ` Ricardo Neri
2026-02-03 20:49 ` Thomas Gleixner
2026-02-04 5:05 ` Ricardo Neri
2026-02-03 16:24 ` Sasha Levin
2026-02-03 17:19 ` Alexander Graf
2026-02-03 17:43 ` David Woodhouse
2026-02-03 20:46 ` Thomas Gleixner
2026-02-03 23:13 ` David Woodhouse
2026-02-04 10:34 ` Thomas Gleixner
-- strict thread matches above, loose matches on Subject: below --
2026-02-02 17:43 [PATCH 0/2] Add HPET NMI Watchdog support Alexander Graf
2026-02-02 17:43 ` [PATCH 1/2] x86/ioapic: Add NMI delivery configuration helper Alexander Graf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260202174803.66640-2-graf@amazon.com \
--to=graf@amazon.com \
--cc=arnd@arndb.de \
--cc=bp@alien8.de \
--cc=clemens@ladisch.de \
--cc=corbet@lwn.net \
--cc=dave.hansen@linux.intel.com \
--cc=dwmw@amazon.co.uk \
--cc=gregkh@linuxfoundation.org \
--cc=hborghor@amazon.de \
--cc=jschoenh@amazon.de \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=nh-open-source@amazon.com \
--cc=nsaenz@amazon.es \
--cc=pasha.tatashin@soleen.com \
--cc=pbonzini@redhat.com \
--cc=sironi@amazon.de \
--cc=tglx@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox