git: 121be555997b - main - arm: Set NEW_PCIB in DEFAULTS rather than a subset of kernel configs
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 22 Feb 2024 18:28:46 UTC
The branch main has been updated by jrtc27:
URL: https://cgit.FreeBSD.org/src/commit/?id=121be555997b3d7727e50d15acabd0ffbf4a4247
commit 121be555997b3d7727e50d15acabd0ffbf4a4247
Author: Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2024-02-22 18:27:45 +0000
Commit: Jessica Clarke <jrtc27@FreeBSD.org>
CommitDate: 2024-02-22 18:27:45 +0000
arm: Set NEW_PCIB in DEFAULTS rather than a subset of kernel configs
All other architectures set NEW_PCIB in DEFAULTS, with arm being the one
remaining straggler that only sets it for GENERIC and TEGRA124.
ARMADA38X and ARMADAXP contain device pci but don't set NEW_PCIB,
however GENERIC claims to support them and as part of that NEW_PCIB
support was added to mv_pci, so these configs are most likely just
stale. Other than NOTES that just leaves ALPINE as the one kernel with
PCI support not covered by GENERIC, but al_pci is supported by arm64
which enables NEW_PCIB, and it's just a generic_pcie_fdt_driver with
some fixup code to deal with quirks so should support PCI_RES_BUS just
fine. Therefore it is believed that all in-tree kernel configs support
NEW_PCIB in reality, and so let's take a step towards removing all the
non-NEW_PCIB code by having it always-on everywhere.
Reviewed by: emaste, jhb, manu
MFC after: 1 month
Differential Revision: https://reviews.freebsd.org/D43806
---
sys/arm/conf/DEFAULTS | 2 ++
sys/arm/conf/GENERIC | 1 -
sys/arm/conf/TEGRA124 | 1 -
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/arm/conf/DEFAULTS b/sys/arm/conf/DEFAULTS
index d28e7b6302f9..85d090dfa782 100644
--- a/sys/arm/conf/DEFAULTS
+++ b/sys/arm/conf/DEFAULTS
@@ -6,4 +6,6 @@ device mem
# Default congestion control algorithm
options CC_CUBIC # include CUBIC congestion control
+
+options NEW_PCIB
options INTRNG # All arm systems use INTRNG these days
diff --git a/sys/arm/conf/GENERIC b/sys/arm/conf/GENERIC
index f8a39cb370d5..ea4076230c5e 100644
--- a/sys/arm/conf/GENERIC
+++ b/sys/arm/conf/GENERIC
@@ -98,7 +98,6 @@ device ahci # AHCI-compatible SATA controllers
#device ata # Legacy ATA/SATA controllers
# PCI
-options NEW_PCIB
device pci
device pci_host_generic
diff --git a/sys/arm/conf/TEGRA124 b/sys/arm/conf/TEGRA124
index 9b75bf2e94f8..223dd925e56b 100644
--- a/sys/arm/conf/TEGRA124
+++ b/sys/arm/conf/TEGRA124
@@ -111,7 +111,6 @@ device ums # USB mouse
#device wlan_amrr # AMRR transmit rate control algorithm
# PCI
-options NEW_PCIB
device pci
# PCI Ethernet NICs that use the common MII bus controller code.