From nobody Sat May 30 23:51:43 2026 X-Original-To: dev-commits-src-main@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 4gScSv3yRhz6gtZB for ; Sat, 30 May 2026 23:51:43 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gScSv1mJdz3bfY for ; Sat, 30 May 2026 23:51:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780185103; 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=1WAVm9Ur5pRc8Y2fA4jaKmnMBbBgin0+2WQ32Ot5VEU=; b=U1D2kyEeIZ0G05o+RmAFunh2qjkfHxrtLXtjaXZEn8UiVnXy2PMYgqAi4gF/Tk0EONYp2v RDYrSkYwCOnxc7PSnM+A3cLcHIArrWLX59Nt1Jvi2DtEGWljPxZsYBgkz0+hSDKfmlFlhF hGZeo/tkW4j7rS3vN5EvYkFPUQ/lb56+BsbG3uXekQyJoYGhKksbF6dBjqVgzYu49kGCRZ jgbgJveC7vQGpmzPgi0Iu2+gZgw2lEVkAzZYNqfk+NrtWu1yPWRkthMdewyf5j9SDSjE+v +MvRlMQkMrTyc0JqUFzAD9XB7mECvWnv8noe64f6nZd4VHIHWKmm4d15YbhMNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780185103; a=rsa-sha256; cv=none; b=jJPFYTlVI86HmkXFdLsFilog2scE17pNLMSEvC8an2oz5VynPZg9A6WwrkTHSNRrH2HZYY vPcACweLLikauXdGqV11OSsgC2O21Jjd8lzvNvrfcNrhSFJSfDMvoZBogGW7u9hW0L89QQ x2wUeXMmBeOhPpgxV2NYGq7XNnNoo2/rnQPuL8V5ENb1aMaH4XkcljCdmhfg9nyxl3Wdrv jSUt09ktUpcA6FBW11losEk8mevLHDdwsQ7W1TQlngOUi1UpurEl9ArS6/O438dmFJZdDn F2lIK0xxTa2eF980HlbVKduVNa8e0A1gdap+kink2HDe+xNCF1yEpqvbLJoxMA== 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=1780185103; 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=1WAVm9Ur5pRc8Y2fA4jaKmnMBbBgin0+2WQ32Ot5VEU=; b=ZARPY+KWma2SyV3x3p3EpgxzfjBhZVpz5fSsLx1WGYcJrH3knxTOObbjhaVAp4Lh1zwQAM aYYazADeyDvmCvmiqMNlP6T8WZK1DkJoCeQjsZRAQEGHzN8cSw94x1pisvFExB87uODHs1 Z5jrSGRidJW8eI51yTKFUrY6cLxFB4RhNSsZsWQUXmsueDbk1qoVoA5grP5lfVmx+rbzyn HUmSAq9BLLqnpcAd2Nlkpy2q4SMMoKKv1dQBvYN2Wiqmr20/B+4JqGfJI21CjZCL6PZKVJ 4dvlNZyokY/kybTJdTchag5DFwE8jEetc+95kw4gYyUOWH862/uc/6Q5/DTyGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gScSv1McGzBGs for ; Sat, 30 May 2026 23:51:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18192 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 30 May 2026 23:51:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: d07460f19483 - main - LinuxKPI: 802.11 suspend/resume: fix the is_pci_dev check List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: d07460f194835410b6a0e99af6b9721b872fb009 Auto-Submitted: auto-generated Date: Sat, 30 May 2026 23:51:43 +0000 Message-Id: <6a1b780f.18192.b58df6a@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d07460f194835410b6a0e99af6b9721b872fb009 commit d07460f194835410b6a0e99af6b9721b872fb009 Author: Bjoern A. Zeeb AuthorDate: 2026-05-30 21:33:51 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-05-30 21:33:51 +0000 LinuxKPI: 802.11 suspend/resume: fix the is_pci_dev check Shortly before I committed the works from a year ago, jhb added a function ("is_pci_device") so that the check against the devclass does not have to be coded in every driver. Use this instead in main (and stable/15 in case the works get MFCed). At the same time this fixes the check (the old one was wrong) as we attach to the LinuxKPI 802.11 driver, e.g., iwlwifi and thus we need to check the parent of the parent and not just the parent to be of the devclass "pci" in the identify bus function. The was the first error. The second was (and this is why it worked) that we checked for == instead of != and so the wrong check became true again. Discussed with: jhb Fixes: 11d69a4558de ("LinuxKPI: 802.11: add support for s/r") MFC after: 3 days X-MFC after: ffcf5e356644 ("pci: Add is_pci_device helper function") Sponsored by: The FreeBSD Foundation --- sys/compat/linuxkpi/common/src/linuxkpi_80211_pm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linuxkpi_80211_pm.c b/sys/compat/linuxkpi/common/src/linuxkpi_80211_pm.c index c69288bd5886..cf9384bf53f2 100644 --- a/sys/compat/linuxkpi/common/src/linuxkpi_80211_pm.c +++ b/sys/compat/linuxkpi/common/src/linuxkpi_80211_pm.c @@ -13,6 +13,7 @@ #include #include +#include #include "linux_80211.h" #include @@ -139,7 +140,7 @@ lkpi_80211_pm_identify(driver_t *driver, device_t parent) return; /* Make sure this is PCI for now. */ - if (device_get_devclass(parent) == devclass_find("pci")) + if (!is_pci_device(parent)) return; if (BUS_ADD_CHILD(parent, 0, driver->name, DEVICE_UNIT_ANY) == NULL)