From nobody Wed Mar 30 15:49:40 2022 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 A6E211A53FA6; Wed, 30 Mar 2022 15:49:41 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KT9q92yQ3z3kMC; Wed, 30 Mar 2022 15:49:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648655381; 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=mi/iTMIxbpugFGMHnQfPrvmHd0ljSjyyoJlycc3Uw74=; b=SH9yXJC846AvZi2Nanf5ae2Udl/wAsdyOXsDo4Lf5XADteMMgjR34rR5W91tI7y6AqMYHO 7o2pKIHXl5fwrwsAygDBfmG+eiHTLBEo3yEgkMJJIXcKWC97AKBp6Z9M8VZQNAuPtO0oeW 11Mpr0VyiytmJCqStnpE1lhHmjaU3XWvYJmnam6+MX7MjJt3ueDDtiUsHxGckaQXmvcsgv iPF9XcLFTxwPjtu0BOu/g2tKwZj6RTGgnE2h7vtWqfJ5IgP0ibpBdjYX76D7CapQ/+AVbE zXCB4QzXWfTDeOQVho6Bjd3fPvHV6D+DUbC5p95Qe22m0FrP7zMFvQmkpzCMQg== 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 B61EF15F18; Wed, 30 Mar 2022 15:49:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22UFne6w019180; Wed, 30 Mar 2022 15:49:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22UFne2r019179; Wed, 30 Mar 2022 15:49:40 GMT (envelope-from git) Date: Wed, 30 Mar 2022 15:49:40 GMT Message-Id: <202203301549.22UFne2r019179@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 3b4a991fa67f - releng/13.1 - iwlwifi: adjust the LinuxKPI pci return for now 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.1 X-Git-Reftype: branch X-Git-Commit: 3b4a991fa67ffd05d4a8865bf8e696f77543981d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648655381; 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=mi/iTMIxbpugFGMHnQfPrvmHd0ljSjyyoJlycc3Uw74=; b=eJnDDlL3ZyU2AtFjI0s5TToNQvA82OmTkhLbiKzolSobhlbcl5LMhD212WVak0OQkRhqo5 EVEzEBHhDoztORpMTPgqZdNKWCvvRuWAJqv/N6s83nbgAvhL8smN/dOLuiKH1tWyFGtqWa RnNdqe42p6pUoA+pyxYQPzA5aWtlcfsKqCMSLGqu/lldTqSBhUZO595koQ02Y6LLYz9WSH lNP619s+YD40eN5sPDwRLNjH7ze28fg6zFUYYUCzK8GYDvddZSxbeNTr769lt7vvbYaimd Cx3vKw2I+Y/+8Ua8iPl/t3fzQOHXNTBGZcVjB/clXgoJMyBjCQreY8geBa3x+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648655381; a=rsa-sha256; cv=none; b=gNRuHECIN/3uJLHgVTSPpYH3jw1Ypva0Jr7ANLPvt6dzhDTQqNtyER09P9Dedrvq13IYay PYLqnXdCiuHSYLbuMFEKo5GWeXXt4AXNIm1gXwmIjQa64/P06mtouqtT1FoQ6Ua3jr3pcj 4GHXUAPKWP7QUsuB7c4LZtBqyJTnQQmHahWi5sfTRgfZWevZqOlh8yq/QRc8+iVnN5sUvL EWj7GA0chw1GFo1u0iC2jYczUr1iSOmXCO3Bsg5VLM2MN3cWOFFKJVVofS55a+zWhbCV/K 0K8NJb23sVakoax35QaWSBpBz4WqpZWxd7pnjngvfDoqFZi8ldJKLo5z3iUskA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=3b4a991fa67ffd05d4a8865bf8e696f77543981d commit 3b4a991fa67ffd05d4a8865bf8e696f77543981d Author: Bjoern A. Zeeb AuthorDate: 2022-03-03 22:24:13 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-03-30 15:45:54 +0000 iwlwifi: adjust the LinuxKPI pci return for now Rather than having LinuxKPI return BUS_PROBE_DEFAULT, return "one less" so that on conflict of IDs others would be preferred. This means that iwm(4) will attach instead of iwlwifi(4) for the chipsets iwm(4) supports and iwlwifi(4) only for the other--in iwm(4) unsupported--chipsets. This is done so that we can enable auto-loading of drivers but for the upcoming 13.1-Release people with working iwm(4) will not yet be affected by iwlwifi(4). Sponsored by: The FreeBSD Foundation Approved by: re (gjb) (cherry picked from commit 3d248a914d923b444f72fb27ba621c0ab2ef464e) (cherry picked from commit fd2c8fe44cfae7ced0ae3d142038dc71e537dbd4) --- sys/contrib/dev/iwlwifi/pcie/drv.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/contrib/dev/iwlwifi/pcie/drv.c b/sys/contrib/dev/iwlwifi/pcie/drv.c index 58a7111d4f40..cd890fae6fbc 100644 --- a/sys/contrib/dev/iwlwifi/pcie/drv.c +++ b/sys/contrib/dev/iwlwifi/pcie/drv.c @@ -1746,6 +1746,10 @@ static struct pci_driver iwl_pci_driver = { .probe = iwl_pci_probe, .remove = iwl_pci_remove, .driver.pm = IWL_PM_OPS, +#if defined(__FreeBSD__) + /* Allow iwm(4) to attach for conflicting IDs for now. */ + .bsd_probe_return = (BUS_PROBE_DEFAULT - 1), +#endif }; int __must_check iwl_pci_register_driver(void)