From nobody Thu Mar 03 23:17:38 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 66EC419E4DF2; Thu, 3 Mar 2022 23:17:39 +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 4K8n2W2G9wz4T6R; Thu, 3 Mar 2022 23:17:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646349459; 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=YmYLwhsTMZ2pwODKws1ajFdPGaV8ndtewdLQuIcv29o=; b=XvvjDPgHlVo8E4Q9VRUYoDrupnOOM4PmabdkYxKQBnDRVC6X1Hr01bum8XsJreBaj3xaSU HPOkN9ZDMRZYcDdHu1YLqBTxIZyPGl+FqiC55dNVnVBO4bWbVQ5tqEqQFsVSVs770xsptY 1Iky6/QIWt67yMOdXQe3/YeBKCfADFSquOcLe/hMhUEYofhxaOg+ElUxvHns96hjzmBlSg 22GrzyokS9JWT3iq/1NqOU2mkL08vcZJld+ThfxGbYqpkpLHZeOULGnrAlf+FGz72o8KOf a4ewuNRGVCjow9pyl3Ti6TQ85WjeTp0fYe9o005SxI8yyA2hyGhW66Hk2x8v6w== 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 27AD720E4A; Thu, 3 Mar 2022 23:17:39 +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 223NHcku015250; Thu, 3 Mar 2022 23:17:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 223NHcPg015249; Thu, 3 Mar 2022 23:17:38 GMT (envelope-from git) Date: Thu, 3 Mar 2022 23:17:38 GMT Message-Id: <202203032317.223NHcPg015249@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 3d248a914d92 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 3d248a914d923b444f72fb27ba621c0ab2ef464e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646349459; 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=YmYLwhsTMZ2pwODKws1ajFdPGaV8ndtewdLQuIcv29o=; b=R7rpFf71cBWqPPOWkgovlhsscyXjxp7os3e43I5TtuBusv4TmiSEQe+uLVIBaG0f+TYQQc kEAoQ7uXP5GoqDaqbpPyG9/m7okw7A6WZwa3QR+OKdYgxP2JOFRt16Yvvt/W4oUmVFEJ4X TP641dsZCjzCNMQ20ieQOe53r13ZmDQ3pqwU6cmm5uf+DtVKpm3tO1837kJVvw2y6sREq9 r4rBXXitBtPAHNNPAqxuPVIIKlgDiZR6SlzI8mLSIhZ/IRpfzY7L8JSol0EKhS0YgAroTA XerQeFdWvD2TR2m02NTJ0IJoF6fC/Qdmz+jwQ3/QQ56jiSYXCKjG/LRq7shoQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646349459; a=rsa-sha256; cv=none; b=YoR/xsRae+koiF2DQihQj5XZVnIKOKjydn4MAtsJBVEBPWw18v15jEU6bxQPQE54Kxq6xZ qxUStwe+VKv2vK3M9aBNBMdsz9shwR91OLUT6QF94YrlSuymTR1tLMCwY+zHL7BKq+n1+K RDkBhy5rW7fNwMq+Qwbb+yzDVo0GMkKH3RY2tCnTdYiu8AWlYk+WXE3g1RFC+BehOohq4I I6bik9s3H10PY5vva2HF6deeefgjPmxqL9tG9nzYolas2/a5QSEmE3kzsvg1QpuprOBOp2 IDL6yMLy1kX3mK3SMDzJCoIHHCf70+xi7IFNE3WllTmMx7jbE642190HLuRIfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=3d248a914d923b444f72fb27ba621c0ab2ef464e commit 3d248a914d923b444f72fb27ba621c0ab2ef464e Author: Bjoern A. Zeeb AuthorDate: 2022-03-03 22:24:13 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-03-03 23:16:40 +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 MFC after: 3 days --- 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)