From nobody Sat Mar 29 20:18:07 2025 X-Original-To: dev-commits-src-main@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 4ZQ7xW4kFKz5s2B5; Sat, 29 Mar 2025 20:18:07 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZQ7xW3CtLz3h9x; Sat, 29 Mar 2025 20:18:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743279487; 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=m+opeSJxXGisQZaIY6mQ3YYGSXGJqhmDCaUz4FFCZbw=; b=M2y2RTuo+Wfzeq3D1U+KAv8ccbx6mAnaCLnTVJiusGcoD+G5dOR/2LQEiSy1a29tFtiqgO XYvKvVC9/zUowImPo1+rClqHnPemQkSmQP1rv6ZTwwMbCdvh9GOsJnzIRkZgipru/b6OT/ os74WW6dTf2KLIt3RDDu3ESvTZTfqHkHgiD5s/uZQIpVfGbPq2QjbQSxQrkqJKnG+BCyo0 Q7MkGA450ytDl3nnfL9hZv5GRCa3W9yCgBteVKOYApq6s0ijO63NIJPdabcUxCG/dFtpb+ WxDrI2YOJ3IiFERrbIxkVaAIN57KNC7mgwIpPLxltZHRDweKRfrsBWPcEuzLKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743279487; a=rsa-sha256; cv=none; b=rq1WO+6/iaBHZEO5YL5iVfOUvexdWS0qXL16yT8SsP/7mDSoPqM+zhMrWEX2YV3JYDob/B hy8pQDPZN734MdSB5QuqzZ7iAwyvq6AWblNwGtZz91ByQsuZblmaqYttnncQHSEhwA/u8W Fyl5/b5y2kKdxh2spAfG8TnoXo/LKJEbdWb8wUA94SyFtRTkNy5B/8qpThvlYe9lh+Oies Z+2Ef4nkeHhPK0O6qSXkvW2rsmzD8UWxbS4kpOmxj2gZw7luxe6Y9CjZiRfBVox1rpKj0E MOVPPilWbheiIedQYTSGfXFLh86nrVmc/GerFvfN6iNLTywDZ8iPtUXC6sZqbA== 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=1743279487; 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=m+opeSJxXGisQZaIY6mQ3YYGSXGJqhmDCaUz4FFCZbw=; b=ggaFZIS/mnZVyHvHqFFVQklCTJXc0lt0JIKWLuAlE2uPs8lJ9emMED6q3n8qRjgdX4B2jP W/PlTeEijMkoObUrbxSIbxyJ40Rnj9XgE9hdXp5jW+yfbfZXcAv7LEaQO8CmSOiJV/HIQT Lq415MLJi7oDWrp6gYkAuamNQ56ftDdXwWQdEL+SBxs0GYI2RmVORABSs1c5CjhH0KzGAL R/kMsYnSL2PnA0m7Kfd2M0AgZlg/mZGZltQnxSrcx3JF5m6KW3dZQ5jovhBGv0aX7PYz9u soVCGhcs2HRxYgdqUVru+LciQ2bNssBxOz6h8A2CqyMlJgdP5035M6+Xl9aHjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZQ7xW2THnzks5; Sat, 29 Mar 2025 20:18:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52TKI71Q048380; Sat, 29 Mar 2025 20:18:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52TKI7va048377; Sat, 29 Mar 2025 20:18:07 GMT (envelope-from git) Date: Sat, 29 Mar 2025 20:18:07 GMT Message-Id: <202503292018.52TKI7va048377@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 0e33c2e6df7a - main - pci: Only re-route IRQs based on firmware on x86 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 0e33c2e6df7a5de65db40c7cc0fc97f66da28ccd Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0e33c2e6df7a5de65db40c7cc0fc97f66da28ccd commit 0e33c2e6df7a5de65db40c7cc0fc97f66da28ccd Author: Colin Percival AuthorDate: 2025-03-28 18:07:01 +0000 Commit: Colin Percival CommitDate: 2025-03-29 20:17:29 +0000 pci: Only re-route IRQs based on firmware on x86 There is a (very historical) call to pci_assign_interrupt for the purpose of routing IRQs which may have been set up wrong by x86 BIOS or firmware. On non-x86 systems, this is unnecessary; and on INTRNG systems it results in a (synthetic) IRQ leak and ultimately a kernel panic after many hotplug/unplug cycles. Suggested by: jhb Reviewed by: jhb MFC after: 2 weeks Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D49560 --- sys/dev/pci/pci.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index fe99d6beb029..3a51e4c38296 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -4175,6 +4175,7 @@ pci_add_resources(device_t bus, device_t dev, int force, uint32_t prefetchmask) if (q->devid == devid && q->type == PCI_QUIRK_MAP_REG) pci_add_map(bus, dev, q->arg1, rl, force, 0); +#if defined(__i386__) || defined(__amd64__) if (cfg->intpin > 0 && PCI_INTERRUPT_VALID(cfg->intline)) { /* * Try to re-route interrupts. Sometimes the BIOS or @@ -4184,6 +4185,7 @@ pci_add_resources(device_t bus, device_t dev, int force, uint32_t prefetchmask) */ pci_assign_interrupt(bus, dev, 1); } +#endif if (pci_usb_takeover && pci_get_class(dev) == PCIC_SERIALBUS && pci_get_subclass(dev) == PCIS_SERIALBUS_USB) {