From nobody Sat Sep 07 01:48:01 2024 X-Original-To: dev-commits-src-branches@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 4X0wwL0DK0z5WSLY; Sat, 07 Sep 2024 01:48:02 +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 4X0wwK6Bvtz4k9X; Sat, 7 Sep 2024 01:48:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725673681; 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=1rX/6T0sUsw4OzHOBRRpi63HW4vMM4jG8fQQCKWathw=; b=Z8w0xHtmgHHLbVFPVkADwtHzC1B4I/jlpI7aNVrMPV7jOGErRXNAJlu+LQV8dFHFMwI4j1 KWpQ7KqQ3b7kNB80xauur31LVSO2SXNVr7NJQzZZuywzbYRibcr/i/lh3hr/agB0xl4D25 vpiXXRntspOkiKBrSVxzM8Hr+sPNJy3XnFrzAYmT53ePE4xrq6Jl+E0q1i5N6og906+JDH Wg2LGOgI9IuYOXiO23BYNTsBXClJe5CIdeffsrNk0Js1wLVh7gk2/3LqcjEJOeQ0s5S9QX fZDxZfxnFiFUeoPiHzgZtKmvM5gdYowrJyhnT6bmzdoygtrvJ+bIVaxFzfwjOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725673681; a=rsa-sha256; cv=none; b=dgE2c9g68PKRRevUrxC+/cWB1wBH38ft9dsHbjtnG9CHtP27AS2fuohkj/wirR7Uv/69aj dHwofJ2wthNzX3gixbsu7Jf8a06rDtkWk7Kn5zRlUpgmxjIS4krPhNU6hfy9dHXp/qPRII 5NGGpGwHZ84LjXj1ugV1/GnsuR6f03WA9CI2NlqAFh7lAa0VYokl/voFttQ7iHYmBkdSFc 2QZO4cVw4vMh2y2TbQJO/onEju86F80yan4hzEgHI6iTqg0fjh0vUbu3N35qOcCJ5IfyWw G0/YwwxjKNpaESEv9pQsJurDHRuoh0wS6H4MJiyHDTxx1Ecytl3RddZaGT3K4A== 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=1725673681; 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=1rX/6T0sUsw4OzHOBRRpi63HW4vMM4jG8fQQCKWathw=; b=rK0+SvSxE37TLL5CIVu2bc23hLX21qz5b7tqL4i25VIJKKMqx3TYynEglogD+5TKsmrhd6 524Sr1EjZBdMtOcJvk1iYpjV3WbJJ79Jq4pzmKQZQYOplLE/u106/vkRa7VBodv9aVUkC2 CauTztnL5pTzdgAhgvXjqNs0PkAw0mk5F1jNgWaXg7Ky6JVJhhNKnnl37NJPV5WLuIyPeg MlJLbivULlMhEE9G4WXeAyD/vrTLI/ELc6yswkF7VvDUnIaVj7qDPrUOdxWullzbQb/ZOh 0PzvnoS61jg1509MtZW9Zd4ZJGgOg34/1lMWvpVt+Rsm6cm+UVx7TmBj2j2aQA== 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 4X0wwK5X9nzG33; Sat, 7 Sep 2024 01:48:01 +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 4871m1sM041821; Sat, 7 Sep 2024 01:48:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4871m1BF041818; Sat, 7 Sep 2024 01:48:01 GMT (envelope-from git) Date: Sat, 7 Sep 2024 01:48:01 GMT Message-Id: <202409070148.4871m1BF041818@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: d861861462d2 - stable/14 - arm: Set NEW_PCIB in DEFAULTS rather than a subset of kernel configs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d861861462d2b9157a6b938c2b4832d6589264a0 Auto-Submitted: auto-generated The branch stable/14 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=d861861462d2b9157a6b938c2b4832d6589264a0 commit d861861462d2b9157a6b938c2b4832d6589264a0 Author: Jessica Clarke AuthorDate: 2024-02-22 18:27:45 +0000 Commit: Jessica Clarke CommitDate: 2024-09-07 00:00:56 +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 (cherry picked from commit 121be555997b3d7727e50d15acabd0ffbf4a4247) --- 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 05bbf6526b34..baaba0880705 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 b1c5be8af587..058a85955a04 100644 --- a/sys/arm/conf/TEGRA124 +++ b/sys/arm/conf/TEGRA124 @@ -112,7 +112,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.