From nobody Thu Jan 23 20:31:03 2025 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 4YfCJR49dNz5lRb0; Thu, 23 Jan 2025 20:31:03 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YfCJR3XbKz3LlB; Thu, 23 Jan 2025 20:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737664263; 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=Xlf07Wg1hVc0E3lk5C1LavsUACzww8fwVbP7U3cwzbE=; b=BJ4JPfDyl8Oavr4KQExtqvMAh/7aWPgkJA/b4ZXek4jlP3SD1vViZ3sy1ZQqfipg/pvtBL WovKOxxYJNNPXY+dDllJ3dP7MufwUov0fYFtEY3PruTIHzwSOThs4fQaBt4HZ6+o+9TA+Z WNnInArgCKAOpfwsyYBTXPjdQMndbEgqewqYXHn6Vjr2d2LP6HPlQxE235gKkYzPq3tglp kYlxqWrccBp5DZgEFaEs3asLaVM6c0nsVJbdRn8sjNZqYhHWZoH9CDBb9T2YZ9BO0U4s3y np0/BrFnQcvfmP4QePTvMNwpKRhZDQyHorssmoDv3GPXM9RxzI3oAnK8EOc9AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737664263; 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=Xlf07Wg1hVc0E3lk5C1LavsUACzww8fwVbP7U3cwzbE=; b=Mh85EzhpaH92zNuxGiv+tRl+OtLcW9lZeW2tm1cy8FyHT/c8ny24qNFo+hmdyFBFZy6+FM HL21d2gaJiqjyWoA5BLGROmpBa0zPUFiLLyrcTN7Pxvtp2YKYO5TckscZEJlhsp98VtVWt JznsMw4y1GpV/h//QzRpI/FUlX9pgTAh6ff0Mn0C5ULZ35YKzEhgVO0s0iBCUKLORbbB2b g5TFtjLLZfNll/J41wq18Q4TxRu+ibz9e7Nws/6Z4xqKwSeJ/AdvbE/qJgVfqftaNMh5Vp v+Nd4ivhFvdKOPGxbMut7f2/XsNJ8fUKI457Kn5VesjQQOgSFT2YcwhSSqdAqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737664263; a=rsa-sha256; cv=none; b=Sy3FJBO8uhTc1C/lGWQxddw/v6cW9ZGzhBCnv/HwEC4evpnThtim1Ab8ZXlp4IIviC69na SLyTwe8Zqu78AxO8lZM4snlqVTbddbjFOIOgD5W7GKJ2d6MQgT1FeLwe05uGYHPD3rE1NV WQByj653BsaSdOuK3w1TOJSiB4KGXepRr0lGWr1tMnmQwvEuQddIX4abj9VxbJ3hZfqQ6h SXfqOB0Kx1C7zhIVt8zufEbyi9vPI0CIuirumYh6upvb18YE4USJvdopvskE89XBcC3un/ DRkBZX0vQRAI4nbsmXHmsXokzbukyIshc3zkX7LJtafbRXw1+TH/RaxmOoHONQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YfCJR381Zzthy; Thu, 23 Jan 2025 20:31:03 +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 50NKV3WQ074253; Thu, 23 Jan 2025 20:31:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50NKV3JJ074250; Thu, 23 Jan 2025 20:31:03 GMT (envelope-from git) Date: Thu, 23 Jan 2025 20:31:03 GMT Message-Id: <202501232031.50NKV3JJ074250@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 5884fab46153 - main - pci: cleanup __PCI_REROUTE_INTERRUPTS 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5884fab46153dee52bda660bcabca95c3cc97f44 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=5884fab46153dee52bda660bcabca95c3cc97f44 commit 5884fab46153dee52bda660bcabca95c3cc97f44 Author: Mitchell Horne AuthorDate: 2025-01-20 15:51:27 +0000 Commit: Mitchell Horne CommitDate: 2025-01-23 20:30:31 +0000 pci: cleanup __PCI_REROUTE_INTERRUPTS This flag was used as a transition for differing pcib implementations. Today it is defined for all supported architectures, and can be removed. Reviewed by: imp, jhb Differential Revision: https://reviews.freebsd.org/D48485 --- sys/amd64/include/param.h | 1 - sys/arm/include/param.h | 2 -- sys/arm64/include/param.h | 2 -- sys/dev/pci/pci.c | 4 ---- sys/i386/include/param.h | 1 - sys/powerpc/include/param.h | 3 --- sys/riscv/include/param.h | 2 -- 7 files changed, 15 deletions(-) diff --git a/sys/amd64/include/param.h b/sys/amd64/include/param.h index 371128c6fe20..86f96ef15832 100644 --- a/sys/amd64/include/param.h +++ b/sys/amd64/include/param.h @@ -48,7 +48,6 @@ */ #define __HAVE_ACPI -#define __PCI_REROUTE_INTERRUPT #ifndef MACHINE #define MACHINE "amd64" diff --git a/sys/arm/include/param.h b/sys/arm/include/param.h index 03131ebcb436..14cd32631a5f 100644 --- a/sys/arm/include/param.h +++ b/sys/arm/include/param.h @@ -49,8 +49,6 @@ #define STACKALIGNBYTES (8 - 1) #define STACKALIGN(p) ((u_int)(p) & ~STACKALIGNBYTES) -#define __PCI_REROUTE_INTERRUPT - #ifndef MACHINE #define MACHINE "arm" #endif diff --git a/sys/arm64/include/param.h b/sys/arm64/include/param.h index c3f6990db79b..753035b7775e 100644 --- a/sys/arm64/include/param.h +++ b/sys/arm64/include/param.h @@ -43,8 +43,6 @@ #define STACKALIGNBYTES (16 - 1) #define STACKALIGN(p) ((uint64_t)(p) & ~STACKALIGNBYTES) -#define __PCI_REROUTE_INTERRUPT - #ifndef MACHINE #define MACHINE "arm64" #endif diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 0b02d873c5a1..30a95298a114 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -4094,7 +4094,6 @@ pci_add_resources(device_t bus, device_t dev, int force, uint32_t prefetchmask) pci_add_map(bus, dev, q->arg1, rl, force, 0); if (cfg->intpin > 0 && PCI_INTERRUPT_VALID(cfg->intline)) { -#ifdef __PCI_REROUTE_INTERRUPT /* * Try to re-route interrupts. Sometimes the BIOS or * firmware may leave bogus values in these registers. @@ -4102,9 +4101,6 @@ pci_add_resources(device_t bus, device_t dev, int force, uint32_t prefetchmask) * have. */ pci_assign_interrupt(bus, dev, 1); -#else - pci_assign_interrupt(bus, dev, 0); -#endif } if (pci_usb_takeover && pci_get_class(dev) == PCIC_SERIALBUS && diff --git a/sys/i386/include/param.h b/sys/i386/include/param.h index 79b6eee9db69..177b4d9a168b 100644 --- a/sys/i386/include/param.h +++ b/sys/i386/include/param.h @@ -43,7 +43,6 @@ #define __HAVE_ACPI #define __HAVE_PIR -#define __PCI_REROUTE_INTERRUPT #ifndef MACHINE #define MACHINE "i386" diff --git a/sys/powerpc/include/param.h b/sys/powerpc/include/param.h index b40ada24ad11..e79e92f76ec2 100644 --- a/sys/powerpc/include/param.h +++ b/sys/powerpc/include/param.h @@ -46,9 +46,6 @@ #include -/* Needed to display interrupts on OFW PCI */ -#define __PCI_REROUTE_INTERRUPT - #ifndef MACHINE #define MACHINE "powerpc" #endif diff --git a/sys/riscv/include/param.h b/sys/riscv/include/param.h index ca9c91f3f981..32b0c7a1e34b 100644 --- a/sys/riscv/include/param.h +++ b/sys/riscv/include/param.h @@ -39,8 +39,6 @@ #define STACKALIGNBYTES (16 - 1) #define STACKALIGN(p) ((uint64_t)(p) & ~STACKALIGNBYTES) -#define __PCI_REROUTE_INTERRUPT - #ifndef MACHINE #define MACHINE "riscv" #endif