From nobody Sun Mar 27 20:13:58 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 04F481A53214; Sun, 27 Mar 2022 20:14:00 +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 4KRRqW4MMfz4nmR; Sun, 27 Mar 2022 20:13:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648412039; 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=nnNmd0LHhMZWJNuofy3CsVdfE3dyjZfm1iUy4us/W08=; b=b8soU4No8dUIT6xoXX07pvUFU3fyKG8wGKMFh2e7gNnX+Tibp47Vu41c5cAyipfRoFhdtZ 24vAT3tM0UEZfjXXznCdTkmlaWuKNIpoABnQCmrH1gVXSO53WxCvYUYNjYYEGFhhoIExtB RLorLBAAPSQffkFjqRcF2kRHmOkjRsnEgLiTqPFKF6brV8+5CzuGP6Bli1A25VRVz0AmvJ ze3doDPtJR+cvw2+eykko7WXhxFXfhVS3YchutIvh/Rp2SGqlGcaaygafltcf2TP9gV4jW WXQjksfa/Lda3d2HN87dQ06kMLTLXFDYyplDICYRmIpjHLM2MTtYqnZ7R88tlg== 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 EC4BF1BBF4; Sun, 27 Mar 2022 20:13:58 +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 22RKDwoY037093; Sun, 27 Mar 2022 20:13:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22RKDwI4037092; Sun, 27 Mar 2022 20:13:58 GMT (envelope-from git) Date: Sun, 27 Mar 2022 20:13:58 GMT Message-Id: <202203272013.22RKDwI4037092@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: fd2c8fe44cfa - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: fd2c8fe44cfae7ced0ae3d142038dc71e537dbd4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648412039; 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=nnNmd0LHhMZWJNuofy3CsVdfE3dyjZfm1iUy4us/W08=; b=Qw02YKyIZNJE8gG1zvCHthDnWdg+xCkoiVU74orj9fHXfYr9QOkKFILoutqUq3hQD7IFvi 6U4auGZHlhl1AUAHrjQ/7QnJeZ3TAendU6o40M4hvvdPcXLU8BbfA05L7hLJYNef3ufL3J DVy+z7KTtseFWza458M6iywOuAPOxw05gsmRJqr1kX5vzl+AQDj+vtS2GZ/BckexBszNTq ugKVEJZIIx2j2sNgN1N5gbUtO8iWM/maJK9dOWe/OKcFCI12FIfzxs77rL+QNwRuz1Tdgr cIUgHfuPZ7FUYtUXP4kMfL1xSTuXaDeiUAB6wFVTQB6v6Qf30eOWcTuCEYmEgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648412039; a=rsa-sha256; cv=none; b=pkdWbg8vqdFHii0ESDCieTS7q6qZLu/rUGQ7soRg7jGz6qJ3vRWiPwe3ciBMZMXoxZa6ny WclbcyXkJ2/13zD1dY+5VDCxlHe0CsQuNcP1na61AEtJyyn0AChSD6mfQDo/s/y3x8wAmn 9YnolVPJGz/UXPhtaqn7nFJHefFLwVLKa8idIcpPi2wdg/MvnSIwxxaRXvrjuOlStdYPFX I+dI+jz+/HGTKsb+OvlniAd9qtxxW6j/VtNhzH3WLsqWlcOvLj56lOIP/xGKALctdSwQ6K pBVIS1BHBsnRnlOnSGwZghoXcSB67oB6qAO0sgyMXwrYtn1JcT4zuSyFcFbipA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=fd2c8fe44cfae7ced0ae3d142038dc71e537dbd4 commit fd2c8fe44cfae7ced0ae3d142038dc71e537dbd4 Author: Bjoern A. Zeeb AuthorDate: 2022-03-03 22:24:13 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-03-27 18:06:48 +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 (cherry picked from commit 3d248a914d923b444f72fb27ba621c0ab2ef464e) --- 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)